68 lines
2.2 KiB
Diff
68 lines
2.2 KiB
Diff
From 3b944bee95c6a5ee561acfc4c4d75d8cc971a567 Mon Sep 17 00:00:00 2001
|
|
From: Avi Kivity <avi@redhat.com>
|
|
Date: Sun, 3 May 2009 17:04:04 +0300
|
|
Subject: [PATCH STABLE 3/3] kvm: Trim cpu features not supported by kvm
|
|
|
|
Remove cpu features that are not supported by kvm from the cpuid features
|
|
reported to the guest.
|
|
|
|
Signed-off-by: Avi Kivity <avi@redhat.com>
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
Signed-off-by: Glauber Costa <glommer@redhat.com>
|
|
---
|
|
target-i386/helper.c | 31 ++++++++++++++++++++++++++++++-
|
|
1 files changed, 30 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/target-i386/helper.c b/target-i386/helper.c
|
|
index 1433857..6af5d23 100644
|
|
--- a/target-i386/helper.c
|
|
+++ b/target-i386/helper.c
|
|
@@ -93,6 +93,21 @@ static void add_flagname_to_bitmaps(char *flagname, uint32_t *features,
|
|
}
|
|
}
|
|
|
|
+static void kvm_trim_features(uint32_t *features, uint32_t supported,
|
|
+ const char *names[])
|
|
+{
|
|
+ int i;
|
|
+ uint32_t mask;
|
|
+
|
|
+ for (i = 0; i < 32; ++i) {
|
|
+ mask = 1U << i;
|
|
+ if ((*features & mask) && !(supported & mask)) {
|
|
+ printf("Processor feature %s not supported by kvm\n", names[i]);
|
|
+ *features &= ~mask;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
typedef struct x86_def_t {
|
|
const char *name;
|
|
uint32_t level;
|
|
@@ -1672,7 +1687,21 @@ CPUX86State *cpu_x86_init(const char *cpu_model)
|
|
#ifdef USE_KQEMU
|
|
kqemu_init(env);
|
|
#endif
|
|
- if (kvm_enabled())
|
|
+ if (kvm_enabled()) {
|
|
kvm_init_vcpu(env);
|
|
+ kvm_trim_features(&env->cpuid_features,
|
|
+ kvm_arch_get_supported_cpuid(env, 1, R_EDX),
|
|
+ feature_name);
|
|
+ kvm_trim_features(&env->cpuid_ext_features,
|
|
+ kvm_arch_get_supported_cpuid(env, 1, R_ECX),
|
|
+ ext_feature_name);
|
|
+ kvm_trim_features(&env->cpuid_ext2_features,
|
|
+ kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX),
|
|
+ ext2_feature_name);
|
|
+ kvm_trim_features(&env->cpuid_ext3_features,
|
|
+ kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX),
|
|
+ ext3_feature_name);
|
|
+ }
|
|
+
|
|
return env;
|
|
}
|
|
--
|
|
1.5.6.6
|
|
|