diff options
| author | Xiao Guangrong <guangrong.xiao@linux.intel.com> | 2015-09-09 14:05:52 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-10-01 15:06:36 +0200 |
| commit | e2821620c0908593e6cb40f79c7e78b31921ed73 (patch) | |
| tree | 1ae8939b093102f8750708936b8b4eda347d0dcb /arch/x86/kvm | |
| parent | 8b3e34e46aca9b6d349b331cd9cf71ccbdc91b2e (diff) | |
| download | linux-stable-e2821620c0908593e6cb40f79c7e78b31921ed73.tar.gz linux-stable-e2821620c0908593e6cb40f79c7e78b31921ed73.tar.bz2 linux-stable-e2821620c0908593e6cb40f79c7e78b31921ed73.zip | |
KVM: VMX: drop rdtscp_enabled check in prepare_vmcs02()
SECONDARY_EXEC_RDTSCP set for L2 guest comes from vmcs12
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 691010604144..8f4c13808232 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9327,8 +9327,7 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) if (cpu_has_secondary_exec_ctrls()) { exec_control = vmx_secondary_exec_control(vmx); - if (!vmx->rdtscp_enabled) - exec_control &= ~SECONDARY_EXEC_RDTSCP; + /* Take the following fields only from vmcs12 */ exec_control &= ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES | SECONDARY_EXEC_RDTSCP | |