"hypervisor" CPU feature is unconditionally enabled/overridden even if it's cleared in cpudef. 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 <[email protected]> --- target-i386/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 73dbf32..59ebe40 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1091,6 +1091,8 @@ static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) env->cpuid_ext4_features = def->ext4_features; env->cpuid_7_0_ebx = def->cpuid_7_0_ebx_features; env->cpuid_xlevel2 = def->xlevel2; + + object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp); } /* convert legacy cpumodel string to string cpu_name and @@ -1190,8 +1192,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, /* not supported bits will be filtered out later */ env->cpuid_kvm_features = ~0; - object_property_set_bool(OBJECT(cpu), true, "hypervisor", errp); - cpu_x86_set_props(cpu, features, errp); QDECREF(features); if (error_is_set(errp)) { -- 1.7.11.2
