diff options
| author | Avi Kivity <avi@redhat.com> | 2009-05-20 15:36:16 -0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-05-20 15:21:20 -0500 |
| commit | 578485d8355dec01bf47755bb6664e416468db82 (patch) | |
| tree | f8dcda881c9e61efbcb8d645be63e1d196e07c10 | |
| parent | a675d9b8b5dbf743f10a5521cfc6ce6f5f96ac81 (diff) | |
| download | qemu-578485d8355dec01bf47755bb6664e416468db82.tar.gz | |
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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | target-i386/helper.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 1433857dae..c98cdcc105 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; @@ -1674,5 +1689,20 @@ CPUX86State *cpu_x86_init(const char *cpu_model) #endif if (kvm_enabled()) kvm_init_vcpu(env); + if (kvm_enabled()) { + 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; } |