[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/15] target-i386: Prepare "vendor" property for
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 14/15] target-i386: Prepare "vendor" property for X86CPU |
Date: |
Wed, 25 Apr 2012 11:23:35 +0200 |
Using it now would incur converting the three x86_def_t vendor words
into a string for object_property_set_str(), then back to three words
in the "vendor" setter.
The built-in CPU definitions use numeric preprocessor defines to
initialize the three words in a charset-safe way, so do not change the
fields to char[12] just to use the setter.
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
target-i386/cpu.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index deac4a7..0ff79a5 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -777,6 +777,47 @@ static void x86_cpuid_set_xlevel(Object *obj, Visitor *v,
void *opaque,
cpu->env.cpuid_xlevel = value;
}
+static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ CPUX86State *env = &cpu->env;
+ char *value;
+ int i;
+
+ value = (char *)g_malloc(12 + 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';
+ return value;
+}
+
+static void x86_cpuid_set_vendor(Object *obj, const char *value,
+ Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ CPUX86State *env = &cpu->env;
+ int i;
+
+ if (strlen(value) != 12) {
+ error_set(errp, QERR_PROPERTY_VALUE_BAD, "",
+ "vendor", value);
+ return;
+ }
+
+ env->cpuid_vendor1 = 0;
+ env->cpuid_vendor2 = 0;
+ env->cpuid_vendor3 = 0;
+ for (i = 0; i < 4; i++) {
+ env->cpuid_vendor1 |= ((uint8_t)value[i ]) << (8 * i);
+ env->cpuid_vendor2 |= ((uint8_t)value[i + 4]) << (8 * i);
+ env->cpuid_vendor3 |= ((uint8_t)value[i + 8]) << (8 * i);
+ }
+ env->cpuid_vendor_override = 1;
+}
+
static char *x86_cpuid_get_model_id(Object *obj, Error **errp)
{
X86CPU *cpu = X86_CPU(obj);
@@ -1671,6 +1712,9 @@ static void x86_cpu_initfn(Object *obj)
object_property_add(obj, "xlevel", "int",
x86_cpuid_get_xlevel,
x86_cpuid_set_xlevel, NULL, NULL, NULL);
+ object_property_add_str(obj, "vendor",
+ x86_cpuid_get_vendor,
+ x86_cpuid_set_vendor, NULL);
object_property_add_str(obj, "model-id",
x86_cpuid_get_model_id,
x86_cpuid_set_model_id, NULL);
--
1.7.7
- [Qemu-devel] [PATCH v3 04/15] target-i386: Add "family" property to X86CPU, (continued)
- [Qemu-devel] [PATCH v3 04/15] target-i386: Add "family" property to X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 15/15] target-i386: Introduce "tsc-frequency" property for X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 02/15] target-i386: Pass X86CPU to cpu_x86_register(), Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 08/15] target-i386: Add property getter for CPU family, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 13/15] target-i386: Introduce "xlevel" property for X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 06/15] target-i386: Add "stepping" property to X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 12/15] target-i386: Introduce "level" property for X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 03/15] target-i386: Add range check for -cpu , family=x, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 11/15] target-i386: Add property getter for CPU model-id, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 07/15] target-i386: Add "model-id" property to X86CPU, Andreas Färber, 2012/04/25
- [Qemu-devel] [PATCH v3 14/15] target-i386: Prepare "vendor" property for X86CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH v3 05/15] target-i386: Add "model" property to X86CPU, Andreas Färber, 2012/04/25