On Wed, Jun 05, 2013 at 03:18:35PM +0200, Igor Mammedov wrote:
> Signed-off-by: Igor Mammedov <imamm...@redhat.com>
Reviewed-by: Eduardo Habkost <ehabk...@redhat.com>
> ---
> target-i386/cpu.c | 20 +-------------------
> 1 files changed, 1 insertions(+), 19 deletions(-)
>
> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
> index 1d997ee..bb86484 100644
> --- a/target-i386/cpu.c
> +++ b/target-i386/cpu.c
> @@ -1290,22 +1290,6 @@ static PropertyInfo qdev_prop_stepping = {
> #define DEFINE_PROP_STEPPING(_n)
> \
> DEFINE_PROP(_n, X86CPU, env.cpuid_version, qdev_prop_stepping, uint32_t)
>
> -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 void x86_cpuid_get_xlevel(Object *obj, Visitor *v, void *opaque,
> const char *name, Error **errp)
> {
> @@ -1503,6 +1487,7 @@ static Property cpu_x86_properties[] = {
> DEFINE_PROP_FAMILY("family"),
> DEFINE_PROP_MODEL("model"),
> DEFINE_PROP_STEPPING("stepping"),
> + DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0),
> DEFINE_PROP_END_OF_LIST(),
> };
>
> @@ -2482,9 +2467,6 @@ static void x86_cpu_initfn(Object *obj)
> cs->env_ptr = env;
> cpu_exec_init(env);
>
> - 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);
> --
> 1.7.1
>
>
--
Eduardo
