KVM: nVMX: Remove unused 'ops' param from nested_vmx_hardware_setup()
PATCH 1/1 KVM: nVMX: Remove unused 'ops' param from nested_vmx_hardware_setup()
Remove a 'struct kvm_x86_ops' param that got left behind when the nested ops were moved to their own struct.
Fixes 33b22172452f0 ("KVM: x86: move nested-related kvm_x86_ops to a separate struct")
Signed-off-by Sean Christopherson <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 3 +-- arch/x86/kvm/vmx/nested.h | 3 +-- arch/x86/kvm/vmx/vmx.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/nested.c +1 -2
@@ -6425,8 +6425,7 @@ void nested_vmx_hardware_unsetup(void) } } -__init int nested_vmx_hardware_setup (struct kvm_x86_ops *ops, -int (*exit_handlers[])(struct kvm_vcpu *)) +__init int nested_vmx_hardware_setup (int (*exit_handlers[])(struct kvm_vcpu *)) {int i;
arch/x86/kvm/vmx/nested.h +1 -2
@@ -19,8 +19,7 @@ enum nvmx_vmentry_status {void vmx_leave_nested (struct kvm_vcpu *vcpu);void nested_vmx_setup_ctls_msrs (struct nested_vmx_msrs *msrs,u32 ept_caps);void nested_vmx_hardware_unsetup (void ); -__init int nested_vmx_hardware_setup (struct kvm_x86_ops *ops, -int (*exit_handlers[])(struct kvm_vcpu *)); +__init int nested_vmx_hardware_setup (int (*exit_handlers[])(struct kvm_vcpu *));void nested_vmx_set_vmcs_shadowing_bitmap (void );void nested_vmx_free_vcpu (struct kvm_vcpu *vcpu); enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu,
arch/x86/kvm/vmx/vmx.c +1 -2
@@ -8112,8 +8112,7 @@ static __init int hardware_setup(void)nested_vmx_setup_ctls_msrs (&vmcs_config.nested, vmx_capability.ept); - r =nested_vmx_hardware_setup (&vmx_x86_ops, - kvm_vmx_exit_handlers); + r =nested_vmx_hardware_setup (kvm_vmx_exit_handlers);if (r)return r; }
Signature · 1 line
2.26.0
Quoted 6 lines · Sean Christopherson
Remove a 'struct
kvm_x86_ops' param that got left behind when the nested ops were moved to their own struct.Fixes 33b22172452f0 ("KVM: x86: move nested-related kvm_x86_ops to a separate struct")Signed-off-by Sean Christopherson <[email protected]>
Reviewed-by Jim Mattson <[email protected]>