Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2a05fef authored by Suravee Suthikulpanit's avatar Suravee Suthikulpanit Committed by Radim Krčmář
Browse files

KVM: Add struct kvm_vcpu pointer parameter to get_enable_apicv() 



Modify struct kvm_x86_ops.arch.apicv_active() to take struct kvm_vcpu
pointer as parameter in preparation to subsequent changes.

Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent dfa20099

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ struct kvm_x86_ops { 
	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

	bool (*get_enable_apicv)(void);

	bool (*get_enable_apicv)(struct kvm_vcpu *vcpu);

	void (*refresh_apicv_exec_ctrl)(struct kvm_vcpu *vcpu);

	void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr);

	void (*hwapic_isr_update)(struct kvm_vcpu *vcpu, int isr);

arch/x86/kvm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -4407,7 +4407,7 @@ static void svm_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set) 
	return;

}



static bool svm_get_enable_apicv(void)

static bool svm_get_enable_apicv(struct kvm_vcpu *vcpu)

{

	return avic;

}

arch/x86/kvm/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -5012,7 +5012,7 @@ static void vmx_disable_intercept_msr_x2apic(u32 msr, int type, bool apicv_activ 
	}

}



static bool vmx_get_enable_apicv(void)

static bool vmx_get_enable_apicv(struct kvm_vcpu *vcpu)

{

	return enable_apicv;

}

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -7980,7 +7980,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	BUG_ON(vcpu->kvm == NULL);

	kvm = vcpu->kvm;



	vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv();

	vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv(vcpu);

	vcpu->arch.pv.pv_unhalted = false;

	vcpu->arch.emulate_ctxt.ops = &emulate_ops;

	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_reset_bsp(vcpu))