diff options
| author | Izik Eidus <ieidus@redhat.com> | 2009-10-26 18:20:37 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2009-10-26 22:53:53 +0200 |
| commit | 3fb4ae3a5cbc97b8b0f2cf1c483afe8ee86f300a (patch) | |
| tree | f3b9c89430ef5b2f3e90ec17de8b5490b9a83439 | |
| parent | a8dd6022241a7ca3849028354790157afb7a99f7 (diff) | |
vdesktop: remove para-virt conflicts.
Signed-off-by: Izik Eidus <ieidus@redhat.com>
| -rw-r--r-- | qemu/qemu-kvm-x86.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/qemu/qemu-kvm-x86.c b/qemu/qemu-kvm-x86.c index 9004b10f..40cb8ebc 100644 --- a/qemu/qemu-kvm-x86.c +++ b/qemu/qemu-kvm-x86.c @@ -18,7 +18,6 @@ #include <libkvm.h> #include <pthread.h> #include <sys/utsname.h> -#include <linux/kvm_para.h> #define MSR_IA32_TSC 0x10 @@ -474,18 +473,6 @@ struct kvm_para_features { int cap; int feature; } para_features[] = { -#ifdef KVM_CAP_CLOCKSOURCE - { KVM_CAP_CLOCKSOURCE, KVM_FEATURE_CLOCKSOURCE }, -#endif -#ifdef KVM_CAP_NOP_IO_DELAY - { KVM_CAP_NOP_IO_DELAY, KVM_FEATURE_NOP_IO_DELAY }, -#endif -#ifdef KVM_CAP_PV_MMU - { KVM_CAP_PV_MMU, KVM_FEATURE_MMU_OP }, -#endif -#ifdef KVM_CAP_CR3_CACHE - { KVM_CAP_CR3_CACHE, KVM_FEATURE_CR3_CACHE }, -#endif { -1, -1 } }; |