diff options
| author | Sean Christopherson | 2019-05-07 21:17:53 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-18 11:47:40 +0200 |
| commit | c075c3e49d7ae3599106f1af53352268030469db (patch) | |
| tree | 378a5e654d199b68194169a2133ee165cfc672b6 /arch/x86/kvm/vmx/vmx.c | |
| parent | KVM: nVMX: Copy PDPTRs to/from vmcs12 only when necessary (diff) | |
| download | kernel-qcow2-linux-c075c3e49d7ae3599106f1af53352268030469db.tar.gz kernel-qcow2-linux-c075c3e49d7ae3599106f1af53352268030469db.tar.xz kernel-qcow2-linux-c075c3e49d7ae3599106f1af53352268030469db.zip | |
KVM: nVMX: Use adjusted pin controls for vmcs02
KVM provides a module parameter to allow disabling virtual NMI support
to simplify testing (hardware *without* virtual NMI support is hard to
come by but it does have users). When preparing vmcs02, use the accessor
for pin controls to ensure that the module param is respected for nested
guests.
Opportunistically swap the order of applying L0's and L1's pin controls
to better align with other controls and to prepare for a future patche
that will ignore L1's, but not L0's, preemption timer flag.
Fixes: d02fcf50779ec ("kvm: vmx: Allow disabling virtual NMI support")
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index a74936a5cf1a..0e722fa5e189 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -3825,7 +3825,7 @@ void set_cr4_guest_host_mask(struct vcpu_vmx *vmx) vmcs_writel(CR4_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr4_guest_owned_bits); } -static u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx) +u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx) { u32 pin_based_exec_ctrl = vmcs_config.pin_based_exec_ctrl; |