From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlmY5-00083R-FJ for qemu-devel@nongnu.org; Wed, 27 Nov 2013 16:21:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VlmY1-0001PG-2E for qemu-devel@nongnu.org; Wed, 27 Nov 2013 16:21:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VlmY0-0001OM-Go for qemu-devel@nongnu.org; Wed, 27 Nov 2013 16:21:24 -0500 Date: Wed, 27 Nov 2013 22:21:15 +0100 From: Igor Mammedov Message-ID: <20131127222115.44ad0ca4@thinkpad> In-Reply-To: <5296322D.1030800@suse.de> References: <1373927181-24247-1-git-send-email-imammedo@redhat.com> <1373927181-24247-3-git-send-email-imammedo@redhat.com> <5296322D.1030800@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 02/20] target-i386: convert 'hv_spinlocks' to static property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?ISO-8859-1?B?RuRyYmVy?= Cc: Paolo Bonzini , Anthony Liguori , Vadim Rozenfeld , qemu-devel@nongnu.org, Eduardo Habkost On Wed, 27 Nov 2013 18:55:57 +0100 Andreas F=E4rber wrote: > Am 16.07.2013 00:25, schrieb Igor Mammedov: > > Signed-off-by: Igor Mammedov > > --- > > v2: > > - rebase on top of hyperv_spinlock_attempts in X86CPU > > --- > > target-i386/cpu.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- > > 1 file changed, 47 insertions(+), 1 deletion(-) > >=20 > > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > > index 14e9c7e..00c2882 100644 > > --- a/target-i386/cpu.c > > +++ b/target-i386/cpu.c > > @@ -1473,6 +1473,49 @@ static void x86_cpu_get_feature_words(Object *ob= j, Visitor *v, void *opaque, > > error_propagate(errp, err); > > } > > =20 > > +static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, > > + const char *name, Error **errp) > > +{ > > + X86CPU *cpu =3D X86_CPU(obj); > > + int64_t value =3D cpu->hyperv_spinlock_attempts; > > + > > + visit_type_int(v, &value, name, errp); > > +} > > + > > +static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque, > > + const char *name, Error **errp) > > +{ > > + const int64_t min =3D 0xFFF; > > + const int64_t max =3D UINT_MAX; > > + X86CPU *cpu =3D X86_CPU(obj); > > + int64_t value; > > + > > + visit_type_int(v, &value, name, errp); > > + if (error_is_set(errp)) { > > + return; > > + } >=20 > errp may be NULL. And if an Error gets raised here but not set to *errp > for lack of pointer, value might be uninitialized: > object_property_parse(obj, "not-a-number", "hv-spinlocks", NULL); > So we cannot rely on error_is_set(errp) but must use a local variable to > enforce any return. Fixed on qom-cpu-next as follows: in this particular above couldn't happen since all callers provide not NULL errp. But it'd be cleaner to be prepared for generic case. But anyway any caller that supplies invalid value && NULL errp are going to get object in incorrect state and suffer later from it. >=20 > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index 435b3b9..0a5a4f0 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -1611,10 +1611,12 @@ static void x86_set_hv_spinlocks(Object *obj, > Visitor *v, void *opaque, > const int64_t min =3D 0xFFF; > const int64_t max =3D UINT_MAX; > X86CPU *cpu =3D X86_CPU(obj); > + Error *err =3D NULL; > int64_t value; >=20 > - visit_type_int(v, &value, name, errp); > - if (error_is_set(errp)) { > + visit_type_int(v, &value, name, &err); > + if (err) { > + error_propagate(errp, err); > return; > } >=20 >=20 > https://github.com/afaerber/qemu-cpu/commits/qom-cpu-next >=20 > Regards, > Andreas >=20 >=20 > > + > > + if (value < min || value > max) { > > + error_setg(errp, "Property %s.%s doesn't take value %" PRId64 > > + " (minimum: %" PRId64 ", maximum: %" PRId64 ")", > > + object_get_typename(obj), name ? name : "null", > > + value, min, max); > > + return; > > + } > > + cpu->hyperv_spinlock_attempts =3D value; > > +} > > + > > +static PropertyInfo qdev_prop_spinlocks =3D { > > + .name =3D "int", > > + .get =3D x86_get_hv_spinlocks, > > + .set =3D x86_set_hv_spinlocks, > > +}; > > + > > +static Property cpu_x86_properties[] =3D { > > + { .name =3D "hv-spinlocks", .info =3D &qdev_prop_spinlocks }, > > + DEFINE_PROP_END_OF_LIST(), > > +}; > > + > > static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *na= me) > > { > > x86_def_t *def; > > @@ -1586,6 +1629,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu,= char *features, Error **errp) > > } else if (!strcmp(featurestr, "hv-spinlocks")) { > > char *err; > > const int min =3D 0xFFF; > > + char num[32]; > > numvalue =3D strtoul(val, &err, 0); > > if (!*val || *err) { > > error_setg(errp, "bad numerical value %s", val); > > @@ -1597,7 +1641,8 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu,= char *features, Error **errp) > > min); > > numvalue =3D min; > > } > > - cpu->hyperv_spinlock_attempts =3D numvalue; > > + snprintf(num, sizeof(num), "%" PRId32, numvalue); > > + object_property_parse(OBJECT(cpu), num, featurestr, er= rp); > > } else { > > error_setg(errp, "unrecognized feature %s", featurestr= ); > > goto out; > > @@ -2521,6 +2566,7 @@ static void x86_cpu_common_class_init(ObjectClass= *oc, void *data) > > xcc->parent_realize =3D dc->realize; > > dc->realize =3D x86_cpu_realizefn; > > dc->bus_type =3D TYPE_ICC_BUS; > > + dc->props =3D cpu_x86_properties; > > =20 > > xcc->parent_reset =3D cc->reset; > > cc->reset =3D x86_cpu_reset; >=20 > --=20 > SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany > GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg >=20 --=20 Regards, Igor