From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlnbh-0002bN-7R for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vlnbb-0007do-7H for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vlnba-0007dX-V0 for qemu-devel@nongnu.org; Wed, 27 Nov 2013 17:29:11 -0500 From: Igor Mammedov Date: Wed, 27 Nov 2013 23:28:48 +0100 Message-Id: <1385591336-2755-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1385591336-2755-1-git-send-email-imammedo@redhat.com> References: <1385591336-2755-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 08/16] target-i386: cpu: convert 'vendor' to static property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de Signed-off-by: Igor Mammedov --- v4: - fix invalid use of error_is_set(errp) if errp == NULL v3: - cpu_x86_properties changed to x86_cpu_properties upstream, rebase on top of it. v2: - afaerber: inline property definition inside of property array. --- target-i386/cpu.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5fb6c68..1ad1087 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1402,7 +1402,8 @@ static PropertyInfo qdev_prop_stepping = { .set = x86_cpuid_version_set_stepping, }; -static char *x86_cpuid_get_vendor(Object *obj, Error **errp) +static void x86_cpuid_get_vendor(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; @@ -1411,16 +1412,25 @@ static char *x86_cpuid_get_vendor(Object *obj, Error **errp) value = (char *)g_malloc(CPUID_VENDOR_SZ + 1); x86_cpu_vendor_words2str(value, env->cpuid_vendor1, env->cpuid_vendor2, env->cpuid_vendor3); - return value; + visit_type_str(v, &value, name, errp); + g_free(value); } -static void x86_cpuid_set_vendor(Object *obj, const char *value, - Error **errp) +static void x86_cpuid_set_vendor(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; + Error *err = NULL; + char *value; int i; + visit_type_str(v, &value, name, &err); + if (err) { + error_propagate(errp, err); + return; + } + if (strlen(value) != CPUID_VENDOR_SZ) { error_set(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value); @@ -1435,8 +1445,15 @@ static void x86_cpuid_set_vendor(Object *obj, const char *value, env->cpuid_vendor2 |= ((uint8_t)value[i + 4]) << (8 * i); env->cpuid_vendor3 |= ((uint8_t)value[i + 8]) << (8 * i); } + g_free(value); } +static PropertyInfo qdev_prop_vendor = { + .name = "string", + .get = x86_cpuid_get_vendor, + .set = x86_cpuid_set_vendor, +}; + static char *x86_cpuid_get_model_id(Object *obj, Error **errp) { X86CPU *cpu = X86_CPU(obj); @@ -2653,9 +2670,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(env); - 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); @@ -2726,6 +2740,7 @@ static Property x86_cpu_properties[] = { { .name = "family", .info = &qdev_prop_family }, { .name = "model", .info = &qdev_prop_model }, { .name = "stepping", .info = &qdev_prop_stepping }, + { .name = "vendor", .info = &qdev_prop_vendor }, DEFINE_PROP_END_OF_LIST() }; -- 1.8.3.1