From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQS-0003wr-Pf for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUZQR-0007aD-Ls for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQR-0007Zz-EN for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:31 -0400 From: "Daniel P. Berrange" Date: Wed, 26 Aug 2015 13:03:13 +0100 Message-Id: <1440590594-5514-7-git-send-email-berrange@redhat.com> In-Reply-To: <1440590594-5514-1-git-send-email-berrange@redhat.com> References: <1440590594-5514-1-git-send-email-berrange@redhat.com> Subject: [Qemu-devel] [PATCH RFC 6/7] x86-cpu: register properties against the class instead of object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= This converts the x86 CPU object to register its properties against the class rather than object. Signed-off-by: Daniel P. Berrange --- target-i386/cpu.c | 55 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 780a5bc..e183d0b 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3038,33 +3038,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(cs, &error_abort); - object_property_add(obj, "family", "int", - x86_cpuid_version_get_family, - x86_cpuid_version_set_family, NULL, NULL, NULL); - 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); - object_property_add_str(obj, "vendor", - x86_cpuid_get_vendor, - x86_cpuid_set_vendor, NULL); - object_property_add_str(obj, "model-id", - x86_cpuid_get_model_id, - x86_cpuid_set_model_id, NULL); - object_property_add(obj, "tsc-frequency", "int", - x86_cpuid_get_tsc_freq, - x86_cpuid_set_tsc_freq, NULL, NULL, NULL); - object_property_add(obj, "apic-id", "int", - x86_cpuid_get_apic_id, - x86_cpuid_set_apic_id, NULL, NULL, NULL); - object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", - x86_cpu_get_feature_words, - NULL, NULL, NULL, NULL); - object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo", - x86_cpu_get_filtered_features, - NULL, NULL, NULL, NULL); cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; @@ -3199,6 +3172,34 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) #endif cc->cpu_exec_enter = x86_cpu_exec_enter; cc->cpu_exec_exit = x86_cpu_exec_exit; + + object_class_property_add(oc, "family", "int", + x86_cpuid_version_get_family, + x86_cpuid_version_set_family, NULL, NULL, NULL); + object_class_property_add(oc, "model", "int", + x86_cpuid_version_get_model, + x86_cpuid_version_set_model, NULL, NULL, NULL); + object_class_property_add(oc, "stepping", "int", + x86_cpuid_version_get_stepping, + x86_cpuid_version_set_stepping, NULL, NULL, NULL); + object_class_property_add_str(oc, "vendor", + x86_cpuid_get_vendor, + x86_cpuid_set_vendor, NULL); + object_class_property_add_str(oc, "model-id", + x86_cpuid_get_model_id, + x86_cpuid_set_model_id, NULL); + object_class_property_add(oc, "tsc-frequency", "int", + x86_cpuid_get_tsc_freq, + x86_cpuid_set_tsc_freq, NULL, NULL, NULL); + object_class_property_add(oc, "apic-id", "int", + x86_cpuid_get_apic_id, + x86_cpuid_set_apic_id, NULL, NULL, NULL); + object_class_property_add(oc, "feature-words", "X86CPUFeatureWordInfo", + x86_cpu_get_feature_words, + NULL, NULL, NULL, NULL); + object_class_property_add(oc, "filtered-features", "X86CPUFeatureWordInfo", + x86_cpu_get_filtered_features, + NULL, NULL, NULL, NULL); } static const TypeInfo x86_cpu_type_info = { -- 2.4.3