diff options
| author |  Paolo Bonzini <pbonzini@redhat.com>
| 2023-03-14 07:40:56 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com>
| 2023-03-14 09:40:54 -0400 |
| commit | 77900bffed14894476969042718a9ca05eb1f477 (patch) | |
| tree | b234e8eee0e529c31fe42d3f126a5172b8d14300 /arch/x86/kvm/vmx/nested.c | |
| parent | KVM: nVMX: add missing consistency checks for CR0 and CR4 (diff) | |
| download | linux-77900bffed14894476969042718a9ca05eb1f477.tar.gz linux-77900bffed14894476969042718a9ca05eb1f477.tar.bz2 linux-77900bffed14894476969042718a9ca05eb1f477.zip | |
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: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx/nested.c')
| -rw-r--r-- | arch/x86/kvm/vmx/nested.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index fd7af786b724..1bc2b80273c9 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -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; |