Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 00:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Suthikulpanit, Suravee 2019-09-13 19:00:49 +00:00 committed by Paolo Bonzini
parent 34059c2570
commit 2cf9af0b56
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/kvm_host.h
View File

@ -1081,7 +1081,7 @@ struct kvm_x86_ops {
void (*enable_nmi_window)(struct kvm_vcpu *vcpu); void (*enable_nmi_window)(struct kvm_vcpu *vcpu);
void (*enable_irq_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); 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 (*refresh_apicv_exec_ctrl)(struct kvm_vcpu *vcpu);
void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr); void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr);
void (*hwapic_isr_update)(struct kvm_vcpu *vcpu, int isr); void (*hwapic_isr_update)(struct kvm_vcpu *vcpu, int isr);

4
arch/x86/kvm/svm.c
View File

@ -5112,9 +5112,9 @@ static void svm_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
return; 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) static void svm_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)

2
arch/x86/kvm/vmx/vmx.c
View File

@ -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; return enable_apicv;
} }

2
arch/x86/kvm/x86.c
View File

@ -9340,7 +9340,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
goto fail_free_pio_data; goto fail_free_pio_data;
if (irqchip_in_kernel(vcpu->kvm)) { 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); r = kvm_create_lapic(vcpu, lapic_timer_advance_ns);
if (r < 0) if (r < 0)
goto fail_mmu_destroy; goto fail_mmu_destroy;