KVM: x86: svm: remove unneeded nested_enable_evmcs() hook (956e255c) · Commits · 戴 / test

Since commit ("KVM: x86: nVMX: Allow nested_enable_evmcs to be NULL") the code in x86.c is prepared to see nested_enable_evmcs being NULL and in VMX case it actually is when nesting is disabled. Remove the unneeded stub from SVM code. Signed-off-by:

Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by:

Jim Mattson <jmattson@google.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/svm.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -7099,13 +7099,6 @@ failed:
		return ret;
		}

		static int nested_enable_evmcs(struct kvm_vcpu *vcpu,
		uint16_t *vmcs_version)
		{
		/* Intel-only feature */
		return -ENODEV;
		}

		static bool svm_need_emulation_on_page_fault(struct kvm_vcpu *vcpu)
		{
		unsigned long cr4 = kvm_read_cr4(vcpu);
		@@ -7311,7 +7304,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
		.mem_enc_reg_region = svm_register_enc_region,
		.mem_enc_unreg_region = svm_unregister_enc_region,

		.nested_enable_evmcs = nested_enable_evmcs,
		.nested_enable_evmcs = NULL,
		.nested_get_evmcs_version = NULL,

		.need_emulation_on_page_fault = svm_need_emulation_on_page_fault,

Admin message