[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu 1/7] kvm: Add fake KVM constants to avoid #i
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH qom-cpu 1/7] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code |
Date: |
Mon, 7 Jan 2013 16:20:42 -0200 |
Any KVM-specific code that use these constants must check if
kvm_enabled() is true before using them.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Cc: address@hidden
Cc: Michael S. Tsirkin <address@hidden>
Cc: Gleb Natapov <address@hidden>
Cc: Marcelo Tosatti <address@hidden>
---
include/sysemu/kvm.h | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 3db19ff..15f9658 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -21,6 +21,20 @@
#ifdef CONFIG_KVM
#include <linux/kvm.h>
#include <linux/kvm_para.h>
+#else
+/* These constants must never be used at runtime if kvm_enabled() is false.
+ * They exist so we don't need #ifdefs around KVM-specific code that already
+ * checks kvm_enabled() properly.
+ */
+#define KVM_CPUID_SIGNATURE 0
+#define KVM_CPUID_FEATURES 0
+#define KVM_FEATURE_CLOCKSOURCE 0
+#define KVM_FEATURE_NOP_IO_DELAY 0
+#define KVM_FEATURE_MMU_OP 0
+#define KVM_FEATURE_CLOCKSOURCE2 0
+#define KVM_FEATURE_ASYNC_PF 0
+#define KVM_FEATURE_STEAL_TIME 0
+#define KVM_FEATURE_PV_EOI 0
#endif
extern int kvm_allowed;
--
1.7.11.7
- [Qemu-devel] [PATCH qom-cpu 0/7] disable kvm_mmu + -cpu "enforce" fixes (v3), Eduardo Habkost, 2013/01/07
- [Qemu-devel] [PATCH qom-cpu 1/7] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code,
Eduardo Habkost <=
- [Qemu-devel] [PATCH qom-cpu 6/7] target-i386/cpu.c: Add feature name array for ext4_features, Eduardo Habkost, 2013/01/07
- [Qemu-devel] [PATCH qom-cpu 3/7] target-i386: Disable kvm_mmu by default, Eduardo Habkost, 2013/01/07
- [Qemu-devel] [PATCH qom-cpu 7/7] target-i386: check/enforce: Check all feature words, Eduardo Habkost, 2013/01/07
- [Qemu-devel] [PATCH qom-cpu 5/7] target-i386: kvm_check_features_against_host(): Use feature_word_info, Eduardo Habkost, 2013/01/07
- [Qemu-devel] [PATCH qom-cpu 4/7] target-i386/cpu: Introduce FeatureWord typedefs, Eduardo Habkost, 2013/01/07
- Re: [Qemu-devel] [PATCH qom-cpu 0/7] disable kvm_mmu + -cpu "enforce" fixes (v3), Gleb Natapov, 2013/01/09
- Re: [Qemu-devel] [PATCH qom-cpu 0/7] disable kvm_mmu + -cpu "enforce" fixes (v3), Andreas Färber, 2013/01/10