From patchwork Fri Aug 10 11:22:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, 19/20] target-i386: move init of "hypervisor" feature into CPU initializer from cpudef Date: Fri, 10 Aug 2012 01:22:35 -0000 From: Igor Mammedov X-Patchwork-Id: 176468 Message-Id: <1344597756-2890-20-git-send-email-imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, jan.kiszka@siemens.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, avi@redhat.com, pbonzini@redhat.com, akong@redhat.com, lersek@redhat.com, afaerber@suse.de, ehabkost@redhat.com "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 --- 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 0174c4d..43601a3 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1092,6 +1092,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 @@ -1176,8 +1178,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); - for (ent = qdict_first(features); ent; ent = qdict_next(features, ent)) { const QString *qval = qobject_to_qstring(qdict_entry_value(ent)); object_property_parse(OBJECT(cpu), qstring_get_str(qval),