[Qemu-devel] [PATCH 02/15] target-i386: cpu: convert 'model' to static property

[Igor Mammedov]

Signed-off-by: Igor Mammedov <imamm...@redhat.com>
---
 target-i386/cpu.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index c87cc9f..5d379af 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -1238,6 +1238,14 @@ static void x86_cpuid_version_set_model(Object *obj, 
Visitor *v, void *opaque,
     env->cpuid_version |= ((value & 0xf) << 4) | ((value >> 4) << 16);
 }
 
+static PropertyInfo qdev_prop_model = {
+    .name  = "uint32",
+    .get   = x86_cpuid_version_get_model,
+    .set   = x86_cpuid_version_set_model,
+};
+#define DEFINE_PROP_MODEL(_n)                                                  
\
+    DEFINE_PROP(_n, X86CPU, env.cpuid_version, qdev_prop_model, uint32_t)
+
 static void x86_cpuid_version_get_stepping(Object *obj, Visitor *v,
                                            void *opaque, const char *name,
                                            Error **errp)
@@ -1485,6 +1493,7 @@ static void x86_cpu_get_feature_words(Object *obj, 
Visitor *v, void *opaque,
 
 static Property cpu_x86_properties[] = {
     DEFINE_PROP_FAMILY("family"),
+    DEFINE_PROP_MODEL("model"),
     DEFINE_PROP_END_OF_LIST(),
 };
 
@@ -2464,9 +2473,6 @@ static void x86_cpu_initfn(Object *obj)
     cs->env_ptr = env;
     cpu_exec_init(env);
 
-    object_property_add(obj, "model", "int",
-                        x86_cpuid_version_get_model,
-                        x86_cpuid_version_set_model, NULL, NULL, NULL);
     object_property_add(obj, "stepping", "int",
                         x86_cpuid_version_get_stepping,
                         x86_cpuid_version_set_stepping, NULL, NULL, NULL);
-- 
1.7.1