From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkDcJ-0003Ii-0f for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkDcH-0001Fm-Jn for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkDcH-0001Fa-AI for qemu-devel@nongnu.org; Wed, 05 Jun 2013 09:19:05 -0400 From: Igor Mammedov Date: Wed, 5 Jun 2013 15:18:36 +0200 Message-Id: <1370438326-27054-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1370438326-27054-1-git-send-email-imammedo@redhat.com> References: <1370438326-27054-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 05/15] target-i386: cpu: convert 'xlevel' to static property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, afaerber@suse.de Signed-off-by: Igor Mammedov --- 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 bb86484..f42282e 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_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); @@ -1488,6 +1472,7 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_MODEL("model"), DEFINE_PROP_STEPPING("stepping"), DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0), + DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -2467,9 +2452,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(env); - 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); -- 1.7.1