From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KWXfq-0001iR-To for qemu-devel@nongnu.org; Fri, 22 Aug 2008 10:31:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KWXfp-0001hg-Hd for qemu-devel@nongnu.org; Fri, 22 Aug 2008 10:31:34 -0400 Received: from [199.232.76.173] (port=34652 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KWXfp-0001hb-3t for qemu-devel@nongnu.org; Fri, 22 Aug 2008 10:31:33 -0400 Received: from cantor.suse.de ([195.135.220.2]:46484 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KWXfo-0002Ks-An for qemu-devel@nongnu.org; Fri, 22 Aug 2008 10:31:32 -0400 Message-ID: <48AEC195.1030808@suse.de> Date: Fri, 22 Aug 2008 15:39:33 +0200 From: Alexander Graf MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070600030808070305000600" Subject: [Qemu-devel] [PATCH 1/3] [x86] Clean up vendor identification v3 Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------070600030808070305000600 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Right now CPU vendor identification contains a lot of magic numbers. The patch cleans them up to defines, so we can identify the CPU later on without copying magic numbers. Signed-off-by: Alexander Graf --------------070600030808070305000600 Content-Type: text/x-patch; name="se01-clean-vendor.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="se01-clean-vendor.patch" Index: qemu/target-i386/cpu.h =================================================================== --- qemu.orig/target-i386/cpu.h +++ qemu/target-i386/cpu.h @@ -333,6 +333,14 @@ #define CPUID_EXT3_IBS (1 << 10) #define CPUID_EXT3_SKINIT (1 << 12) +#define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */ +#define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */ +#define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */ + +#define CPUID_VENDOR_AMD_1 0x68747541 /* "Auth" */ +#define CPUID_VENDOR_AMD_2 0x69746e65 /* "enti" */ +#define CPUID_VENDOR_AMD_3 0x444d4163 /* "cAMD" */ + #define EXCP00_DIVZ 0 #define EXCP01_SSTP 1 #define EXCP02_NMI 2 Index: qemu/target-i386/helper.c =================================================================== --- qemu.orig/target-i386/helper.c +++ qemu/target-i386/helper.c @@ -146,9 +146,9 @@ static x86_def_t x86_defs[] = { { .name = "qemu64", .level = 2, - .vendor1 = 0x68747541, /* "Auth" */ - .vendor2 = 0x69746e65, /* "enti" */ - .vendor3 = 0x444d4163, /* "cAMD" */ + .vendor1 = CPUID_VENDOR_AMD_1, + .vendor2 = CPUID_VENDOR_AMD_2, + .vendor3 = CPUID_VENDOR_AMD_3, .family = 6, .model = 2, .stepping = 3, @@ -347,9 +347,9 @@ static int cpu_x86_register (CPUX86State env->cpuid_vendor2 = def->vendor2; env->cpuid_vendor3 = def->vendor3; } else { - env->cpuid_vendor1 = 0x756e6547; /* "Genu" */ - env->cpuid_vendor2 = 0x49656e69; /* "ineI" */ - env->cpuid_vendor3 = 0x6c65746e; /* "ntel" */ + env->cpuid_vendor1 = CPUID_VENDOR_INTEL_1; + env->cpuid_vendor2 = CPUID_VENDOR_INTEL_2; + env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3; } env->cpuid_level = def->level; env->cpuid_version = (def->family << 8) | (def->model << 4) | def->stepping; --------------070600030808070305000600--