Patchwork [12/20] target-i386: cpu: convert 'stepping' to static property

login
register
mail settings
Submitter Igor Mammedov
Date July 15, 2013, 10:26 p.m.
Message ID <1373927181-24247-13-git-send-email-imammedo@redhat.com>
Download mbox | patch
Permalink /patch/259288/
State New
Headers show

Comments

Igor Mammedov - July 15, 2013, 10:26 p.m.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
  v2:
    - afaerber: inline property definition inside of
                property array.
---
 target-i386/cpu.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 4b8bcf1..c1fe87e 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1273,6 +1273,12 @@  static void x86_cpuid_version_set_stepping(Object *obj, Visitor *v,
     env->cpuid_version |= value & 0xf;
 }
 
+static PropertyInfo qdev_prop_stepping = {
+    .name  = "uint32",
+    .get   = x86_cpuid_version_get_stepping,
+    .set   = x86_cpuid_version_set_stepping,
+};
+
 static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
 {
     X86CPU *cpu = X86_CPU(obj);
@@ -1498,6 +1504,7 @@  static Property cpu_x86_properties[] = {
     DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
     { .name = "family", .info = &qdev_prop_family },
     { .name = "model", .info = &qdev_prop_model },
+    { .name = "stepping", .info = &qdev_prop_stepping },
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -2458,9 +2465,6 @@  static void x86_cpu_initfn(Object *obj)
     cs->env_ptr = env;
     cpu_exec_init(env);
 
-    object_property_add(obj, "stepping", "int",
-                        x86_cpuid_version_get_stepping,
-                        x86_cpuid_version_set_stepping, NULL, NULL, NULL);
     object_property_add_str(obj, "vendor",
                             x86_cpuid_get_vendor,
                             x86_cpuid_set_vendor, NULL);