| Message ID | 1350918203-25198-14-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/22/12 11:02, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > 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 c9d8dbc..951d12b 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -220,6 +220,7 @@ static Property cpu_x86_properties[] = { > 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_UINT32("level", X86CPU, env.cpuid_level, 0), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -1068,22 +1069,6 @@ 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); > - > - visit_type_uint32(v, &cpu->env.cpuid_level, name, errp); > -} > - > -static void x86_cpuid_set_level(Object *obj, Visitor *v, void *opaque, > - const char *name, Error **errp) > -{ > - X86CPU *cpu = X86_CPU(obj); > - > - visit_type_uint32(v, &cpu->env.cpuid_level, name, errp); > -} > - > static char *x86_cpuid_get_vendor(Object *obj, Error **errp) > { > X86CPU *cpu = X86_CPU(obj); > @@ -2093,9 +2078,6 @@ 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, "vendor", > x86_cpuid_get_vendor, > x86_cpuid_set_vendor, NULL); Reviewed-by: Don Slutz <Don@CloudSwitch.com>
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c9d8dbc..951d12b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -220,6 +220,7 @@ static Property cpu_x86_properties[] = { 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_UINT32("level", X86CPU, env.cpuid_level, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -1068,22 +1069,6 @@ 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); - - visit_type_uint32(v, &cpu->env.cpuid_level, name, errp); -} - -static void x86_cpuid_set_level(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) -{ - X86CPU *cpu = X86_CPU(obj); - - visit_type_uint32(v, &cpu->env.cpuid_level, name, errp); -} - static char *x86_cpuid_get_vendor(Object *obj, Error **errp) { X86CPU *cpu = X86_CPU(obj); @@ -2093,9 +2078,6 @@ 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, "vendor", x86_cpuid_get_vendor, x86_cpuid_set_vendor, NULL);
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)