summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-12-26 12:57:04 +0100
committerAvi Kivity <avi@qumranet.com>2008-01-30 17:01:20 +0100
commit774ead3ad9bcbc05ef6aaebb9bdf8b4c3126923b (patch)
tree0395ee65292f99bd43ab2cd07beb554d99cb096f /arch/x86/kvm/x86.c
parentKVM: Accelerated apic support (diff)
downloadlinux-774ead3ad9bcbc05ef6aaebb9bdf8b4c3126923b.tar.xz
linux-774ead3ad9bcbc05ef6aaebb9bdf8b4c3126923b.zip
KVM: Disable vapic support on Intel machines with FlexPriority
FlexPriority accelerates the tpr without any patching. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e7eac27adb7f..1f48ec871035 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -684,9 +684,11 @@ int kvm_dev_ioctl_check_extension(long ext)
case KVM_CAP_USER_MEMORY:
case KVM_CAP_SET_TSS_ADDR:
case KVM_CAP_EXT_CPUID:
- case KVM_CAP_VAPIC:
r = 1;
break;
+ case KVM_CAP_VAPIC:
+ r = !kvm_x86_ops->cpu_has_accelerated_tpr();
+ break;
default:
r = 0;
break;