Commit 2cf9af0b authored by Suthikulpanit, Suravee's avatar Suthikulpanit, Suravee Committed by Paolo Bonzini
Browse files

kvm: x86: Modify kvm_x86_ops.get_enable_apicv() to use struct kvm parameter 



Generally, APICv for all vcpus in the VM are enable/disable in the same
manner. So, get_enable_apicv() should represent APICv status of the VM
instead of each VCPU.

Modify kvm_x86_ops.get_enable_apicv() to take struct kvm as parameter
instead of struct kvm_vcpu.

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarSuravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 34059c25

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,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)(struct kvm_vcpu *vcpu);

	bool (*get_enable_apicv)(struct kvm *kvm);

	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

+2 −2
Original line number Diff line number Diff line
@@ -5112,9 +5112,9 @@ static void svm_set_virtual_apic_mode(struct kvm_vcpu *vcpu) 
	return;

}



static bool svm_get_enable_apicv(struct kvm_vcpu *vcpu)

static bool svm_get_enable_apicv(struct kvm *kvm)

{

	return avic && irqchip_split(vcpu->kvm);

	return avic && irqchip_split(kvm);

}



static void svm_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)

arch/x86/kvm/vmx/vmx.c

+1 −1
Original line number Diff line number Diff line
@@ -3757,7 +3757,7 @@ void pt_update_intercept_for_msr(struct vcpu_vmx *vmx) 
	}

}



static bool vmx_get_enable_apicv(struct kvm_vcpu *vcpu)

static bool vmx_get_enable_apicv(struct kvm *kvm)

{

	return enable_apicv;

}

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -9340,7 +9340,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
		goto fail_free_pio_data;



	if (irqchip_in_kernel(vcpu->kvm)) {

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

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

		r = kvm_create_lapic(vcpu, lapic_timer_advance_ns);

		if (r < 0)

			goto fail_mmu_destroy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE