From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRUvD-0005yi-Ke for qemu-devel@nongnu.org; Thu, 25 Oct 2012 17:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TRUvC-0008HL-L4 for qemu-devel@nongnu.org; Thu, 25 Oct 2012 17:24:59 -0400 Received: from hub021-nj-2.exch021.serverdata.net ([206.225.164.217]:63081) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TRUvC-0008HG-Gt for qemu-devel@nongnu.org; Thu, 25 Oct 2012 17:24:58 -0400 Message-ID: <5089AE29.1020004@CloudSwitch.Com> Date: Thu, 25 Oct 2012 17:24:57 -0400 From: Don Slutz MIME-Version: 1.0 References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> <1350918203-25198-32-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-32-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 31/37] target-i386: convert "family" to static property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de On 10/22/12 11:03, Igor Mammedov wrote: > Signed-off-by: Igor Mammedov > --- > - in addition use error_setg() instead of error_set() > --- > target-i386/cpu.c | 96 +++++++++++++++++++++++++++++-------------------------- > 1 file changed, 51 insertions(+), 45 deletions(-) > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 308dc4c..c804965 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -530,6 +530,56 @@ PropertyInfo qdev_prop_model = { > #define DEFINE_PROP_MODEL(_n, _s, _f) \ > DEFINE_PROP(_n, _s, _f, qdev_prop_model, uint32_t) > > +static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, > + const char *name, Error **errp) > +{ > + X86CPU *cpu = X86_CPU(obj); > + CPUX86State *env = &cpu->env; > + int64_t value; > + > + value = (env->cpuid_version >> 8) & 0xf; > + if (value == 0xf) { > + value += (env->cpuid_version >> 20) & 0xff; > + } > + visit_type_int(v, &value, name, errp); > +} > + > +static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque, > + const char *name, Error **errp) > +{ > + X86CPU *cpu = X86_CPU(obj); > + CPUX86State *env = &cpu->env; > + const int64_t min = 0; > + const int64_t max = 0xff + 0xf; > + int64_t value; > + > + visit_type_int(v, &value, name, errp); > + if (error_is_set(errp)) { > + return; > + } > + if (value < min || value > max) { > + error_setg(errp, "Property %s.%s doesn't take value %" PRId64 " (min" > + "imum: %" PRId64 ", maximum: %" PRId64, > + object_get_typename(obj), name, value, min, max); > + return; > + } > + > + env->cpuid_version &= ~0xff00f00; > + if (value > 0x0f) { > + env->cpuid_version |= 0xf00 | ((value - 0x0f) << 20); > + } else { > + env->cpuid_version |= value << 8; > + } > +} > + > +PropertyInfo qdev_prop_family = { > + .name = "uint32", > + .get = x86_cpuid_version_get_family, > + .set = x86_cpuid_version_set_family, > +}; > +#define DEFINE_PROP_FAMILY(_n, _s, _f) \ > + DEFINE_PROP(_n, _s, _f, qdev_prop_family, uint32_t) > + > static Property cpu_x86_properties[] = { > DEFINE_PROP_BIT("f-fpu", X86CPU, env.cpuid_features, 0, false), > DEFINE_PROP_BIT("f-vme", X86CPU, env.cpuid_features, 1, false), > @@ -654,6 +704,7 @@ static Property cpu_x86_properties[] = { > DEFINE_PROP_MODEL_ID("model-id"), > DEFINE_PROP_STEPPING("stepping", X86CPU, env.cpuid_version), > DEFINE_PROP_MODEL("model", X86CPU, env.cpuid_version), > + DEFINE_PROP_FAMILY("family", X86CPU, env.cpuid_version), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -1363,47 +1414,6 @@ static int check_features_against_host(X86CPU *cpu) > return rv; > } > > -static void x86_cpuid_version_get_family(Object *obj, Visitor *v, void *opaque, > - const char *name, Error **errp) > -{ > - X86CPU *cpu = X86_CPU(obj); > - CPUX86State *env = &cpu->env; > - int64_t value; > - > - value = (env->cpuid_version >> 8) & 0xf; > - if (value == 0xf) { > - value += (env->cpuid_version >> 20) & 0xff; > - } > - visit_type_int(v, &value, name, errp); > -} > - > -static void x86_cpuid_version_set_family(Object *obj, Visitor *v, void *opaque, > - const char *name, Error **errp) > -{ > - X86CPU *cpu = X86_CPU(obj); > - CPUX86State *env = &cpu->env; > - const int64_t min = 0; > - const int64_t max = 0xff + 0xf; > - int64_t value; > - > - visit_type_int(v, &value, name, errp); > - if (error_is_set(errp)) { > - return; > - } > - if (value < min || value > max) { > - error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, "", > - name ? name : "null", value, min, max); > - return; > - } > - > - env->cpuid_version &= ~0xff00f00; > - if (value > 0x0f) { > - env->cpuid_version |= 0xf00 | ((value - 0x0f) << 20); > - } else { > - env->cpuid_version |= value << 8; > - } > -} > - > static void cpudef_2_x86_cpu(X86CPU *cpu, x86_def_t *def, Error **errp) > { > CPUX86State *env = &cpu->env; > @@ -2268,10 +2278,6 @@ static void x86_cpu_initfn(Object *obj) > > cpu_exec_init(env); > > - object_property_add(obj, "family", "int", > - x86_cpuid_version_get_family, > - x86_cpuid_version_set_family, NULL, NULL, NULL); > - > env->cpuid_apic_id = env->cpu_index; > > /* init various static tables used in TCG mode */ Reviewed-by: Don Slutz