diff options
| author | Sheng Yang <sheng.yang@intel.com> | 2007-09-12 18:03:11 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-09-12 13:21:26 +0300 |
| commit | 28621bdce24324e1f8b33fa25595cc0609153be6 (patch) | |
| tree | 39159b9b585bd4da25d1b99eae42888b96230eba | |
| parent | 58d8159c7264eee015ad0656afd018aecbb3c69f (diff) | |
KVM: VMX: Prevent setting CPU_BASED_TPR_SHADOW on i386 hostkvm-39
Though tpr shadow feature can be used on i386 host, but it needs support from
virtual apic access feature which hasn't been implemented yet, otherwise it
will cause trouble on i386 machine which supports this feature.
This patch disables tpr shadow feature for i386 host now.
Signed-off-by: Sheng Yang <sheng.yang@intel.com>
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/vmx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 4e4ed0e0d476..4f115a8e45ef 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -902,7 +902,11 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) CPU_BASED_USE_IO_BITMAPS | CPU_BASED_MOV_DR_EXITING | CPU_BASED_USE_TSC_OFFSETING; +#ifdef CONFIG_X86_64 opt = CPU_BASED_TPR_SHADOW; +#else + opt = 0; +#endif if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS, &_cpu_based_exec_control) < 0) return -EIO; |