From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJ6-0007Fi-TH for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SznJ5-0000fv-Rj for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29857) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJ5-0000fn-JG for qemu-devel@nongnu.org; Fri, 10 Aug 2012 07:23:07 -0400 From: Igor Mammedov Date: Fri, 10 Aug 2012 13:22:22 +0200 Message-Id: <1344597756-2890-7-git-send-email-imammedo@redhat.com> In-Reply-To: <1344597756-2890-1-git-send-email-imammedo@redhat.com> References: <1344597756-2890-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [RFC 06/20] 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, 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 --- 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 783c6f4..a47cc12 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -745,8 +745,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) @@ -981,9 +990,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