From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrER-00031E-9P for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:27:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UyrEQ-00022G-7z for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UyrEQ-00021t-0b for qemu-devel@nongnu.org; Mon, 15 Jul 2013 18:26:58 -0400 From: Igor Mammedov Date: Tue, 16 Jul 2013 00:26:07 +0200 Message-Id: <1373927181-24247-15-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 14/20] target-i386: cpu: convert 'model-id' 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?= * check "if (model_id == NULL)" looks unnecessary now, since all builtin model-ids are not NULL and user shouldn't be able to set it NULL (cpumodel string parsing code takes care of it, if feature is specified as "model-id=" on command line, its parsing will result in an empty string as value). Signed-off-by: Igor Mammedov --- v2: - afaerber: inline property definition inside of property array. --- target-i386/cpu.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2ae3565..2c8e710 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1329,7 +1329,8 @@ static PropertyInfo qdev_prop_vendor = { .set = x86_cpuid_set_vendor, }; -static char *x86_cpuid_get_model_id(Object *obj, Error **errp) +static void x86_cpuid_get_model_id(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; @@ -1341,18 +1342,21 @@ static char *x86_cpuid_get_model_id(Object *obj, Error **errp) value[i] = env->cpuid_model[i >> 2] >> (8 * (i & 3)); } value[48] = '\0'; - return value; + visit_type_str(v, &value, name, errp); + g_free(value); } -static void x86_cpuid_set_model_id(Object *obj, const char *model_id, - Error **errp) +static void x86_cpuid_set_model_id(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { X86CPU *cpu = X86_CPU(obj); CPUX86State *env = &cpu->env; int c, len, i; + char *model_id; - if (model_id == NULL) { - model_id = ""; + visit_type_str(v, &model_id, name, errp); + if (error_is_set(errp)) { + return; } len = strlen(model_id); memset(env->cpuid_model, 0, 48); @@ -1364,8 +1368,15 @@ static void x86_cpuid_set_model_id(Object *obj, const char *model_id, } env->cpuid_model[i >> 2] |= c << (8 * (i & 3)); } + g_free(model_id); } +static PropertyInfo qdev_prop_model_id = { + .name = "string", + .get = x86_cpuid_get_model_id, + .set = x86_cpuid_set_model_id, +}; + static void x86_cpuid_get_tsc_freq(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -1521,6 +1532,7 @@ static Property cpu_x86_properties[] = { { .name = "model", .info = &qdev_prop_model }, { .name = "stepping", .info = &qdev_prop_stepping }, { .name = "vendor", .info = &qdev_prop_vendor }, + { .name = "model-id", .info = &qdev_prop_model_id }, DEFINE_PROP_END_OF_LIST(), }; @@ -2481,9 +2493,6 @@ static void x86_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(env); - 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); -- 1.8.3.1