@@ -1092,6 +1092,9 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp)
env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features;
env->cpuid_xlevel2 = def->xlevel2;
+ /* not supported bits will be filtered out later */
+ env->cpuid_kvm_features = ~0;
+
object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp);
}
@@ -1167,7 +1170,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
{
x86_def_t *def;
- CPUX86State *env = &cpu->env;
QDict *features;
char *name;
@@ -1189,9 +1191,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def,
cpudef_2_x86_cpu(cpu, x86_cpu_def, errp);
- /* not supported bits will be filtered out later */
- env->cpuid_kvm_features = ~0;
-
cpu_x86_set_props(cpu, features, errp);
QDECREF(features);
if (error_is_set(errp)) {
Moving it inside CPU initializer from cpudef will help to split cpu_x86_find_by_name() into default init and user settable properties. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)