Message ID | 1370438326-27054-7-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, Jun 05, 2013 at 03:18:37PM +0200, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> > --- > target-i386/cpu.c | 31 ++++++++++++++++++++++++------- > 1 files changed, 24 insertions(+), 7 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index f42282e..21e7334 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1290,7 +1290,8 @@ static PropertyInfo qdev_prop_stepping = { > #define DEFINE_PROP_STEPPING(_n) \ > DEFINE_PROP(_n, X86CPU, env.cpuid_version, qdev_prop_stepping, uint32_t) > > -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; > @@ -1299,16 +1300,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); > @@ -1323,6 +1331,17 @@ 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, > +}; > +#define DEFINE_PROP_VENDOR(_n) { \ > + .name = _n, \ > + .info = &qdev_prop_vendor \ > } > > static char *x86_cpuid_get_model_id(Object *obj, Error **errp) > @@ -1473,6 +1492,7 @@ static Property cpu_x86_properties[] = { > DEFINE_PROP_STEPPING("stepping"), > DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0), > DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0), > + DEFINE_PROP_VENDOR("vendor"), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -2452,9 +2472,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.7.1 > >
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index f42282e..21e7334 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1290,7 +1290,8 @@ static PropertyInfo qdev_prop_stepping = { #define DEFINE_PROP_STEPPING(_n) \ DEFINE_PROP(_n, X86CPU, env.cpuid_version, qdev_prop_stepping, uint32_t) -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; @@ -1299,16 +1300,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); @@ -1323,6 +1331,17 @@ 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, +}; +#define DEFINE_PROP_VENDOR(_n) { \ + .name = _n, \ + .info = &qdev_prop_vendor \ } static char *x86_cpuid_get_model_id(Object *obj, Error **errp) @@ -1473,6 +1492,7 @@ static Property cpu_x86_properties[] = { DEFINE_PROP_STEPPING("stepping"), DEFINE_PROP_UINT32("level", X86CPU, env.cpuid_level, 0), DEFINE_PROP_UINT32("xlevel", X86CPU, env.cpuid_xlevel, 0), + DEFINE_PROP_VENDOR("vendor"), DEFINE_PROP_END_OF_LIST(), }; @@ -2452,9 +2472,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);
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- target-i386/cpu.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-)