From patchwork Wed Sep 26 20:32:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [06/22] target-i386: xlevel should be more than 0x80000000, move fixup into setter From: Igor Mammedov X-Patchwork-Id: 187199 Message-Id: <1348691578-17231-7-git-send-email-imammedo@redhat.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mtosatti@redhat.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com, lersek@redhat.com, afaerber@suse.de, stefanha@linux.vnet.ibm.com Date: Wed, 26 Sep 2012 22:32:42 +0200 Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 50efe5f..a713960 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -973,8 +973,17 @@ static void x86_cpuid_set_xlevel(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { X86CPU *cpu = X86_CPU(obj); + uint32_t value; - visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp); + visit_type_uint32(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + + if (value < 0x80000000) { + value += 0x80000000; + } + cpu->env.cpuid_xlevel = value; } static char *x86_cpuid_get_vendor(Object *obj, Error **errp) @@ -1229,9 +1238,6 @@ static int cpu_x86_find_by_name(X86CPU *cpu, x86_def_t *x86_cpu_def, fprintf(stderr, "bad numerical value %s\n", val); goto error; } - if (numvalue < 0x80000000) { - numvalue += 0x80000000; - } x86_cpu_def->xlevel = numvalue; } else if (!strcmp(featurestr, "vendor")) { if (strlen(val) != 12) {