From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrEO-0002vi-RX for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UyrEN-00021Y-Q5 for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrEN-00021N-JR for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:55 -0400 From: Igor Mammedov Date: Tue, 16 Jul 2013 00:26:06 +0200 Message-Id: <1373927181-24247-14-git-send-email-imammedo@redhat.com> In-Reply-To: <1373927181-24247-1-git-send-email-imammedo@redhat.com> References: <1373927181-24247-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 13/20] 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: Anthony Liguori , Eduardo Habkost , Vadim Rozenfeld , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Signed-off-by: Igor Mammedov --- v2: - afaerber: inline property definition inside of property array. --- target-i386/cpu.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index c1fe87e..2ae3565 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1279,7 +1279,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; @@ -1288,16 +1289,23 @@ 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; + char *value; int i; + visit_type_str(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + if (strlen(value) != CPUID_VENDOR_SZ) { error_set(errp, QERR_PROPERTY_VALUE_BAD, "", "vendor", value); @@ -1312,8 +1320,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); @@ -1505,6 +1520,7 @@ static Property cpu_x86_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(), }; @@ -2465,9 +2481,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); -- 1.8.3.1