]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
KVM: x86: remove get_enable_apicv from kvm_x86_ops
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 22 Jan 2020 15:54:37 +0000 (16:54 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 5 Feb 2020 14:17:40 +0000 (15:17 +0100)
It is unused now.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/svm.c
arch/x86/kvm/vmx/vmx.c

index 4d57e4b74aaea3f0b8bed501aee33e1d74cf93a3..9945c7bebdf818a241cb06f8ecbe12f1ba995629 100644 (file)
@@ -1121,7 +1121,6 @@ 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 *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);
index ed39f72faeaf65776e7bc6f477de076f8e7a5800..b0c343fef14d45e8599d959cc18a16e799b3bd5b 100644 (file)
@@ -5147,11 +5147,6 @@ static void svm_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
        return;
 }
 
-static bool svm_get_enable_apicv(struct kvm *kvm)
-{
-       return avic && irqchip_split(kvm);
-}
-
 static void svm_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr)
 {
 }
@@ -7343,7 +7338,6 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
        .enable_irq_window = enable_irq_window,
        .update_cr8_intercept = update_cr8_intercept,
        .set_virtual_apic_mode = svm_set_virtual_apic_mode,
-       .get_enable_apicv = svm_get_enable_apicv,
        .refresh_apicv_exec_ctrl = svm_refresh_apicv_exec_ctrl,
        .load_eoi_exitmap = svm_load_eoi_exitmap,
        .hwapic_irr_update = svm_hwapic_irr_update,
index 69bd10a563c06eb1ff74c12c51972f20d10cc41a..3e18df4cfb345436c69c70a1930b117520b85bc8 100644 (file)
@@ -3719,11 +3719,6 @@ void pt_update_intercept_for_msr(struct vcpu_vmx *vmx)
        }
 }
 
-static bool vmx_get_enable_apicv(struct kvm *kvm)
-{
-       return enable_apicv;
-}
-
 static bool vmx_guest_apic_has_interrupt(struct kvm_vcpu *vcpu)
 {
        struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -7787,7 +7782,6 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
        .update_cr8_intercept = update_cr8_intercept,
        .set_virtual_apic_mode = vmx_set_virtual_apic_mode,
        .set_apic_access_page_addr = vmx_set_apic_access_page_addr,
-       .get_enable_apicv = vmx_get_enable_apicv,
        .refresh_apicv_exec_ctrl = vmx_refresh_apicv_exec_ctrl,
        .load_eoi_exitmap = vmx_load_eoi_exitmap,
        .apicv_post_state_restore = vmx_apicv_post_state_restore,