Re: [Qemu-devel] [PATCH 12/37] target-i386: convert "xlevel" to static property

[Don Slutz]

On 10/22/12 11:02, Igor Mammedov wrote:

Signed-off-by: Igor Mammedov <imamm...@redhat.com>
---
   - convert to static property
---
  target-i386/cpu.c | 20 +-------------------
  1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index fa974e7..c9d8dbc 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -219,6 +219,7 @@ static Property cpu_x86_properties[] = {
      DEFINE_PROP_BIT("f-smep", X86CPU, env.cpuid_7_0_ebx_features,  7, false),
      DEFINE_PROP_BIT("f-smap", X86CPU, env.cpuid_7_0_ebx_features, 20, false),
      DEFINE_PROP_BIT("vendor-override", X86CPU, env.cpuid_vendor_override, 0, 
false),
+    DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0),
      DEFINE_PROP_END_OF_LIST(),
   };

@@ -1083,22 +1084,6 @@ static void x86_cpuid_set_level(Object *obj, Visitor *v, void *opaque,

      visit_type_uint32(v, &cpu->env.cpuid_level, name, errp);
  }

-static void x86_cpuid_get_xlevel(Object *obj, Visitor *v, void *opaque,

-                                 const char *name, Error **errp)
-{
-    X86CPU *cpu = X86_CPU(obj);
-
-    visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp);
-}
-
-static void x86_cpuid_set_xlevel(Object *obj, Visitor *v, void *opaque,
-                                 const char *name, Error **errp)
-{
-    X86CPU *cpu = X86_CPU(obj);
-
-    visit_type_uint32(v, &cpu->env.cpuid_xlevel, name, errp);
-}
-
  static char *x86_cpuid_get_vendor(Object *obj, Error **errp)
  {
      X86CPU *cpu = X86_CPU(obj);
@@ -2111,9 +2096,6 @@ static void x86_cpu_initfn(Object *obj)
      object_property_add(obj, "level", "int",
                          x86_cpuid_get_level,
                          x86_cpuid_set_level, NULL, NULL, NULL);
-    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);

Reviewed-by: Don Slutz <d...@cloudswitch.com>