From patchwork Wed Feb 27 01:17:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 223449 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 1E7A72C008C for ; Wed, 27 Feb 2013 12:18:40 +1100 (EST) Received: from localhost ([::1]:42487 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAVfK-0003Dv-5N for incoming@patchwork.ozlabs.org; Tue, 26 Feb 2013 20:18:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAVf7-0003DC-Dl for qemu-devel@nongnu.org; Tue, 26 Feb 2013 20:18:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAVf5-0002EK-Ra for qemu-devel@nongnu.org; Tue, 26 Feb 2013 20:18:25 -0500 Received: from [222.73.24.84] (port=45006 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAVf5-0002B0-HB for qemu-devel@nongnu.org; Tue, 26 Feb 2013 20:18:23 -0500 X-IronPort-AV: E=Sophos;i="4.84,744,1355068800"; d="scan'208";a="6774761" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 27 Feb 2013 09:15:49 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r1R1I9QA017375; Wed, 27 Feb 2013 09:18:09 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013022709171923-440818 ; Wed, 27 Feb 2013 09:17:19 +0800 From: liguang To: afaerber@suse.de, imammedo@redhat.com, ehabkost@redhat.com, qemu-devel@nongnu.org Date: Wed, 27 Feb 2013 09:17:17 +0800 Message-Id: <1361927838-31197-2-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1361927838-31197-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1361927838-31197-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/27 09:17:19, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/02/27 09:17:19, Serialize complete at 2013/02/27 09:17:19 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH 2/3] target-i386: convert decimal number to hexadecimal 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 convert cpu mode definitions family and model number which were in decimal into hexadecimal, because they were both composed by code(4-bit) and extend code(4-bit), so, in hexadecimal, we can view the 2 fields easily. Signed-off-by: liguang --- target-i386/cpu.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index ce76055..b92ee73 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -427,7 +427,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "phenom", .level = 5, .vendor = CPUID_VENDOR_AMD, - .family = 16, + .family = 0x10, .model = 2, .stepping = 3, .features = PPRO_FEATURES | @@ -453,7 +453,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "Opteron_G1", .level = 5, .vendor = CPUID_VENDOR_AMD, - .family = 15, + .family = 0xf, .model = 6, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | @@ -475,7 +475,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "Opteron_G2", .level = 5, .vendor = CPUID_VENDOR_AMD, - .family = 15, + .family = 0xf, .model = 6, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | @@ -499,7 +499,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "Opteron_G3", .level = 5, .vendor = CPUID_VENDOR_AMD, - .family = 15, + .family = 0xf, .model = 6, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | @@ -525,7 +525,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "Opteron_G4", .level = 0xd, .vendor = CPUID_VENDOR_AMD, - .family = 21, + .family = 0x15, .model = 1, .stepping = 2, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | @@ -555,7 +555,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "Opteron_G5", .level = 0xd, .vendor = CPUID_VENDOR_AMD, - .family = 21, + .family = 0x15, .model = 2, .stepping = 0, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | @@ -585,7 +585,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "kvm64", .level = 5, .vendor = CPUID_VENDOR_INTEL, - .family = 15, + .family = 0xf, .model = 6, .stepping = 1, /* Missing: CPUID_VME, CPUID_HT */ @@ -620,7 +620,7 @@ static x86_def_t builtin_x86_defs[] = { .name = "kvm32", .level = 5, .vendor = CPUID_VENDOR_INTEL, - .family = 15, + .family = 0xf, .model = 6, .stepping = 1, .features = PPRO_FEATURES | @@ -636,7 +636,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 10, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 14, + .model = 0xe, .stepping = 8, .features = PPRO_FEATURES | CPUID_VME | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_DTS | CPUID_ACPI | @@ -652,7 +652,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 10, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 15, + .model = 0xf, .stepping = 11, .features = PPRO_FEATURES | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | @@ -725,7 +725,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 5, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 28, + .model = 0x1c, .stepping = 2, .features = PPRO_FEATURES | CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA | CPUID_VME | CPUID_DTS | @@ -800,7 +800,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 11, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 44, + .model = 0x2c, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | @@ -820,7 +820,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 0xd, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 42, + .model = 0x2a, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | @@ -843,7 +843,7 @@ static x86_def_t builtin_x86_defs[] = { .level = 0xd, .vendor = CPUID_VENDOR_INTEL, .family = 6, - .model = 60, + .model = 0x3c, .stepping = 1, .features = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA |