diff options
| -rw-r--r-- | target-i386/helper.c | 29 | ||||
| -rw-r--r-- | target-i386/kvm.c | 22 |
2 files changed, 22 insertions, 29 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index d4498e57c1..2e775701d6 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -92,20 +92,6 @@ static void add_flagname_to_bitmaps(const 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)) { - *features &= ~mask; - } - } -} - typedef struct x86_def_t { const char *name; uint32_t level; @@ -1773,21 +1759,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model) qemu_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; } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index c4fd4848c5..70a9b45588 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -117,6 +117,19 @@ uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function, int reg) #endif +static void kvm_trim_features(uint32_t *features, uint32_t supported) +{ + int i; + uint32_t mask; + + for (i = 0; i < 32; ++i) { + mask = 1U << i; + if ((*features & mask) && !(supported & mask)) { + *features &= ~mask; + } + } +} + int kvm_arch_init_vcpu(CPUState *env) { struct { @@ -128,6 +141,15 @@ int kvm_arch_init_vcpu(CPUState *env) env->mp_state = KVM_MP_STATE_RUNNABLE; + kvm_trim_features(&env->cpuid_features, + kvm_arch_get_supported_cpuid(env, 1, R_EDX)); + kvm_trim_features(&env->cpuid_ext_features, + kvm_arch_get_supported_cpuid(env, 1, R_ECX)); + kvm_trim_features(&env->cpuid_ext2_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_EDX)); + kvm_trim_features(&env->cpuid_ext3_features, + kvm_arch_get_supported_cpuid(env, 0x80000001, R_ECX)); + cpuid_i = 0; cpu_x86_cpuid(env, 0, 0, &limit, &unused, &unused, &unused); |