From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQU-0003zV-3F for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUZQQ-0007Zj-3B for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUZQP-0007ZR-Ss for qemu-devel@nongnu.org; Wed, 26 Aug 2015 08:03:30 -0400 From: "Daniel P. Berrange" Date: Wed, 26 Aug 2015 13:03:12 +0100 Message-Id: <1440590594-5514-6-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 5/7] cpu: avoid using object instance state in property getter 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?= When registering the properties 'feature-words' and 'filtered-features' object instance data is being passed in. This can easily be accessed directly via the 'Object *obj' parameter passed to the getter, so the object instance data does not need to be supplied at property registration time. Signed-off-by: Daniel P. Berrange --- target-i386/cpu.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index cfb8aa7..780a5bc 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1766,12 +1766,10 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, void *opaque, } /* Generic getter for "feature-words" and "filtered-features" properties */ -static void x86_cpu_get_feature_words(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static X86CPUFeatureWordInfoList * +x86_cpu_get_feature_words_helper(Object *obj, uint32_t *array) { - uint32_t *array = (uint32_t *)opaque; FeatureWord w; - Error *err = NULL; X86CPUFeatureWordInfo word_infos[FEATURE_WORDS] = { }; X86CPUFeatureWordInfoList list_entries[FEATURE_WORDS] = { }; X86CPUFeatureWordInfoList *list = NULL; @@ -1791,10 +1789,37 @@ static void x86_cpu_get_feature_words(Object *obj, Visitor *v, void *opaque, list = &list_entries[w]; } + return list; +} + + +static void x86_cpu_get_feature_words(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + uint32_t *array = cpu->env.features; + X86CPUFeatureWordInfoList *list = + x86_cpu_get_feature_words_helper(obj, array); + Error *err = NULL; + visit_type_X86CPUFeatureWordInfoList(v, &list, "feature-words", &err); error_propagate(errp, err); } + +static void x86_cpu_get_filtered_features(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + uint32_t *array = cpu->filtered_features; + X86CPUFeatureWordInfoList *list = + x86_cpu_get_feature_words_helper(obj, array); + Error *err = NULL; + + visit_type_X86CPUFeatureWordInfoList(v, &list, "filtered-features", &err); + error_propagate(errp, err); +} + static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -3036,10 +3061,10 @@ static void x86_cpu_initfn(Object *obj) x86_cpuid_set_apic_id, NULL, NULL, NULL); object_property_add(obj, "feature-words", "X86CPUFeatureWordInfo", x86_cpu_get_feature_words, - NULL, NULL, (void *)env->features, NULL); + NULL, NULL, NULL, NULL); object_property_add(obj, "filtered-features", "X86CPUFeatureWordInfo", - x86_cpu_get_feature_words, - NULL, NULL, (void *)cpu->filtered_features, NULL); + x86_cpu_get_filtered_features, + NULL, NULL, NULL, NULL); cpu->hyperv_spinlock_attempts = HYPERV_SPINLOCK_NEVER_RETRY; -- 2.4.3