From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gEn-0005Bq-8d for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1gEl-0003w1-QM for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1gEl-0003vn-Hq for qemu-devel@nongnu.org; Wed, 15 Aug 2012 12:14:27 -0400 From: Igor Mammedov Date: Wed, 15 Aug 2012 18:13:26 +0200 Message-Id: <1345047221-26898-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1345047221-26898-1-git-send-email-imammedo@redhat.com> References: <1345047221-26898-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 06/21] target-i386: xlevel should be more than 0x80000000, move fixup into setter List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, stefanha@linux.vnet.ibm.com, gleb@redhat.com, vijaymohan.pandarathil@hp.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 Signed-off-by: Igor Mammedov Reviewed-by: Eduardo Habkost --- target-i386/cpu.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f31462a..37ba5ef 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -746,8 +746,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) @@ -982,9 +991,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) { -- 1.7.11.2