[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 12/15] target-i386: Introduce "level" property fo
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 12/15] target-i386: Introduce "level" property for X86CPU |
Date: |
Tue, 24 Apr 2012 11:33:38 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
---
target-i386/cpu.c | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 490db76..f2df8d0 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -711,6 +711,39 @@ static void x86_cpuid_version_set_stepping(Object *obj,
Visitor *v,
env->cpuid_version |= value & 0xf;
}
+static void x86_cpuid_get_level(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ int64_t value;
+
+ value = cpu->env.cpuid_level;
+ /* TODO Use visit_type_uint32() once available */
+ visit_type_int(v, &value, name, errp);
+}
+
+static void x86_cpuid_set_level(Object *obj, Visitor *v, void *opaque,
+ const char *name, Error **errp)
+{
+ X86CPU *cpu = X86_CPU(obj);
+ const int64_t min = 0;
+ const int64_t max = UINT32_MAX;
+ int64_t value;
+
+ /* TODO Use visit_type_uint32() once available */
+ visit_type_int(v, &value, name, errp);
+ if (error_is_set(errp)) {
+ return;
+ }
+ if (value < min || value > max) {
+ error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "",
+ name ? name : "null", value, min, max);
+ return;
+ }
+
+ cpu->env.cpuid_level = value;
+}
+
static char *x86_cpuid_get_model_id(Object *obj, Error **errp)
{
X86CPU *cpu = X86_CPU(obj);
@@ -1037,7 +1070,7 @@ int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
env->cpuid_vendor3 = CPUID_VENDOR_INTEL_3;
}
env->cpuid_vendor_override = def->vendor_override;
- env->cpuid_level = def->level;
+ object_property_set_int(OBJECT(cpu), def->level, "level", &error);
object_property_set_int(OBJECT(cpu), def->family, "family", &error);
object_property_set_int(OBJECT(cpu), def->model, "model", &error);
object_property_set_int(OBJECT(cpu), def->stepping, "stepping", &error);
@@ -1601,6 +1634,9 @@ static void x86_cpu_initfn(Object *obj)
object_property_add(obj, "stepping", "int",
x86_cpuid_version_get_stepping,
x86_cpuid_version_set_stepping, NULL, NULL, NULL);
+ object_property_add(obj, "level", "int",
+ x86_cpuid_get_level,
+ x86_cpuid_set_level, NULL, NULL, 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 v2 00/15] QOM'ify x86 CPU, part 2: properties, Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 02/15] target-i386: Pass X86CPU to cpu_x86_register(), Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 06/15] target-i386: Add "stepping" property to X86CPU, Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 08/15] target-i386: Add property getter for CPU family, Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 03/15] target-i386: Add range check for -cpu , family=x, Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 05/15] target-i386: Add "model" property to X86CPU, Andreas Färber, 2012/04/24
- [Qemu-devel] [PATCH v2 04/15] target-i386: Add "family" property to X86CPU, Andreas Färber, 2012/04/24