Commit 77900bff authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: nVMX: remove unnecessary #ifdef 



nested_vmx_check_controls() has already run by the time KVM checks host state,
so the "host address space size" exit control can only be set on x86-64 hosts.
Simplify the condition at the cost of adding some dead code to 32-bit kernels.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 112e6601

arch/x86/kvm/vmx/nested.c

+1 −7
Original line number Diff line number Diff line
@@ -2903,7 +2903,7 @@ static int nested_vmx_check_address_space_size(struct kvm_vcpu *vcpu, 
static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu,

				       struct vmcs12 *vmcs12)

{

	bool ia32e;

	bool ia32e = !!(vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE);



	if (CC(!nested_host_cr0_valid(vcpu, vmcs12->host_cr0)) ||

	    CC(!nested_host_cr4_valid(vcpu, vmcs12->host_cr4)) ||
@@ -2923,12 +2923,6 @@ static int nested_vmx_check_host_state(struct kvm_vcpu *vcpu, 
					   vmcs12->host_ia32_perf_global_ctrl)))

		return -EINVAL;



#ifdef CONFIG_X86_64

	ia32e = !!(vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE);

#else

	ia32e = false;

#endif



	if (ia32e) {

		if (CC(!(vmcs12->host_cr4 & X86_CR4_PAE)))

			return -EINVAL;