mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-26 12:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Use define for cpuid vendor string size

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2012-10-22 17:03:10 +02:00 committed by Andreas Färber
parent 8f961357d0
commit 9df694eeb8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-i386/cpu.c
View File

@ -1106,13 +1106,13 @@ static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
char *value; char *value;
int i; int i;
value = (char *)g_malloc(12 + 1); value = (char *)g_malloc(CPUID_VENDOR_SZ + 1);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
value[i ] = env->cpuid_vendor1 >> (8 * i); value[i ] = env->cpuid_vendor1 >> (8 * i);
value[i + 4] = env->cpuid_vendor2 >> (8 * i); value[i + 4] = env->cpuid_vendor2 >> (8 * i);
value[i + 8] = env->cpuid_vendor3 >> (8 * i); value[i + 8] = env->cpuid_vendor3 >> (8 * i);
} }
value[12] = '\0'; value[CPUID_VENDOR_SZ] = '\0';
return value; return value;
} }
@ -1123,7 +1123,7 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value,
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
int i; int i;
if (strlen(value) != 12) { if (strlen(value) != CPUID_VENDOR_SZ) {
error_set(errp, QERR_PROPERTY_VALUE_BAD, "", error_set(errp, QERR_PROPERTY_VALUE_BAD, "",
"vendor", value); "vendor", value);
return; return;

2
target-i386/cpu.h
View File

@ -510,6 +510,8 @@
#define CPUID_7_0_EBX_ADX (1 << 19) #define CPUID_7_0_EBX_ADX (1 << 19)
#define CPUID_7_0_EBX_SMAP (1 << 20) #define CPUID_7_0_EBX_SMAP (1 << 20)
#define CPUID_VENDOR_SZ 12
#define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */ #define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */
#define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */ #define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */
#define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */ #define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */