From patchwork Fri Aug 10 11:22:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 176469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62E8E2C0097 for ; Fri, 10 Aug 2012 21:56:47 +1000 (EST) Received: from localhost ([::1]:56579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SznJf-0000Ep-7P for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2012 07:23:43 -0400 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 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7ABN4Nn010521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Aug 2012 07:23:05 -0400 Received: from thinkpad.com (vpn-237-192.phx2.redhat.com [10.3.237.192]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7ABMe13018842; Fri, 10 Aug 2012 07:23:01 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 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 Subject: [Qemu-devel] [RFC 06/20] target-i386: xlevel should be more than 0x80000000, move fixup into setter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 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) {