[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/13] target-i386: Use define for cpuid vendor stri
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 12/13] target-i386: Use define for cpuid vendor string size |
Date: |
Thu, 6 Dec 2012 10:06:56 +0100 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.c | 6 +++---
target-i386/cpu.h | 2 ++
2 Dateien geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 7877df1..a631ae9 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1106,13 +1106,13 @@ static char *x86_cpuid_get_vendor(Object *obj, Error
**errp)
char *value;
int i;
- value = (char *)g_malloc(12 + 1);
+ value = (char *)g_malloc(CPUID_VENDOR_SZ + 1);
for (i = 0; i < 4; i++) {
value[i ] = env->cpuid_vendor1 >> (8 * i);
value[i + 4] = env->cpuid_vendor2 >> (8 * i);
value[i + 8] = env->cpuid_vendor3 >> (8 * i);
}
- value[12] = '\0';
+ value[CPUID_VENDOR_SZ] = '\0';
return value;
}
@@ -1123,7 +1123,7 @@ static void x86_cpuid_set_vendor(Object *obj, const char
*value,
CPUX86State *env = &cpu->env;
int i;
- if (strlen(value) != 12) {
+ if (strlen(value) != CPUID_VENDOR_SZ) {
error_set(errp, QERR_PROPERTY_VALUE_BAD, "",
"vendor", value);
return;
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 90ef1ff..386c4f6 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -510,6 +510,8 @@
#define CPUID_7_0_EBX_ADX (1 << 19)
#define CPUID_7_0_EBX_SMAP (1 << 20)
+#define CPUID_VENDOR_SZ 12
+
#define CPUID_VENDOR_INTEL_1 0x756e6547 /* "Genu" */
#define CPUID_VENDOR_INTEL_2 0x49656e69 /* "ineI" */
#define CPUID_VENDOR_INTEL_3 0x6c65746e /* "ntel" */
--
1.7.10.4
- [Qemu-devel] [PATCH 05/13] qga/channel-posix.c: Include headers it needs, (continued)
- [Qemu-devel] [PATCH 05/13] qga/channel-posix.c: Include headers it needs, Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 09/13] qdev: qdev_create(): use error_report() instead of hw_error(), Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 08/13] sysemu.h: Include qemu-types.h instead of qemu-common.h, Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 07/13] Create qemu-types.h for struct typedefs, Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 13/13] target-i386: Postpone cpuid_level update to realize time, Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 10/13] target-i386/cpu.c: Coding style fixes, Andreas Färber, 2012/12/06
- [Qemu-devel] [PATCH 12/13] target-i386: Use define for cpuid vendor string size,
Andreas Färber <=
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-12-06, Andreas Färber, 2012/12/07
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2012-12-06, Anthony Liguori, 2012/12/10