From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gP93u-0007rG-Bq for qemu-devel@nongnu.org; Tue, 20 Nov 2018 11:39:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gP93t-0004cU-CP for qemu-devel@nongnu.org; Tue, 20 Nov 2018 11:39:42 -0500 Date: Tue, 20 Nov 2018 17:39:24 +0100 From: Igor Mammedov Message-ID: <20181120173924.0131a3e4@redhat.com> In-Reply-To: <20181107123652.23417-4-marcandre.lureau@redhat.com> References: <20181107123652.23417-1-marcandre.lureau@redhat.com> <20181107123652.23417-4-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-3.2 v3 03/14] qom: make user_creatable_complete() specific to UserCreatable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?TWFyYy1BbmRyw6k=?= Lureau Cc: qemu-devel@nongnu.org, Paolo Bonzini , dgilbert@redhat.com, Richard Henderson , Andreas =?UTF-8?B?RsOkcmJlcg==?= , qemu-arm@nongnu.org, xen-devel@lists.xenproject.org, Artyom Tarasenko , Anthony Perard , Mark Cave-Ayland , Eduardo Habkost , Amit Shah , Stefan Berger , Marcel Apfelbaum , Stefano Stabellini , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Peter Maydell , Corey Minyard , =?UTF-8?B?SGVydsOp?= Poussineau On Wed, 7 Nov 2018 16:36:41 +0400 Marc-Andr=C3=A9 Lureau wrote: > Instead of accepting any Object*, change user_creatable_complete() to > require a UserCreatable*. Modify the callers to pass the appropriate > argument, removing redundant dynamic cast checks in object creation. Looks like it doesn't apply to current HEAD anymore =20 >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > Reviewed-by: Igor Mammedov > --- > include/qom/object_interfaces.h | 4 ++-- > hw/misc/ivshmem.c | 2 +- > hw/virtio/virtio-rng.c | 2 +- > qom/object.c | 12 ++++++++---- > qom/object_interfaces.c | 14 +++----------- > 5 files changed, 15 insertions(+), 19 deletions(-) >=20 > diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfa= ces.h > index 652a16d2ba..682ba1d9b0 100644 > --- a/include/qom/object_interfaces.h > +++ b/include/qom/object_interfaces.h > @@ -51,14 +51,14 @@ typedef struct UserCreatableClass { > =20 > /** > * user_creatable_complete: > - * @obj: the object whose complete() method is called if defined > + * @uc: the user-creatable object whose complete() method is called if d= efined > * @errp: if an error occurs, a pointer to an area to store the error > * > * Wrapper to call complete() method if one of types it's inherited > * from implements USER_CREATABLE interface, otherwise the call does > * nothing. > */ > -void user_creatable_complete(Object *obj, Error **errp); > +void user_creatable_complete(UserCreatable *uc, Error **errp); > =20 > /** > * user_creatable_can_be_deleted: > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index f88910e55c..478f41044c 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -1279,7 +1279,7 @@ static void desugar_shm(IVShmemState *s) > object_property_set_bool(obj, true, "share", &error_abort); > object_property_add_child(OBJECT(s), "internal-shm-backend", obj, > &error_abort); > - user_creatable_complete(obj, &error_abort); > + user_creatable_complete(USER_CREATABLE(obj), &error_abort); > s->hostmem =3D MEMORY_BACKEND(obj); > } > =20 > diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c > index 855f1b41d1..30493a2586 100644 > --- a/hw/virtio/virtio-rng.c > +++ b/hw/virtio/virtio-rng.c > @@ -191,7 +191,7 @@ static void virtio_rng_device_realize(DeviceState *de= v, Error **errp) > if (vrng->conf.rng =3D=3D NULL) { > vrng->conf.default_backend =3D RNG_RANDOM(object_new(TYPE_RNG_RA= NDOM)); > =20 > - user_creatable_complete(OBJECT(vrng->conf.default_backend), > + user_creatable_complete(USER_CREATABLE(vrng->conf.default_backen= d), > &local_err); > if (local_err) { > error_propagate(errp, local_err); > diff --git a/qom/object.c b/qom/object.c > index 547dcf97c3..eb770dbf7f 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -417,6 +417,7 @@ void object_initialize_childv(Object *parentobj, cons= t char *propname, > { > Error *local_err =3D NULL; > Object *obj; > + UserCreatable *uc; > =20 > object_initialize(childobj, size, type); > obj =3D OBJECT(childobj); > @@ -431,8 +432,9 @@ void object_initialize_childv(Object *parentobj, cons= t char *propname, > goto out; > } > =20 > - if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { > - user_creatable_complete(obj, &local_err); > + uc =3D (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE= ); > + if (uc) { > + user_creatable_complete(uc, &local_err); > if (local_err) { > object_unparent(obj); > goto out; > @@ -590,6 +592,7 @@ Object *object_new_with_propv(const char *typename, > Object *obj; > ObjectClass *klass; > Error *local_err =3D NULL; > + UserCreatable *uc; > =20 > klass =3D object_class_by_name(typename); > if (!klass) { > @@ -612,8 +615,9 @@ Object *object_new_with_propv(const char *typename, > goto error; > } > =20 > - if (object_dynamic_cast(obj, TYPE_USER_CREATABLE)) { > - user_creatable_complete(obj, &local_err); > + uc =3D (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE= ); > + if (uc) { > + user_creatable_complete(uc, &local_err); > if (local_err) { > object_unparent(obj); > goto error; > diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c > index 97b79b48bb..db85d1eb75 100644 > --- a/qom/object_interfaces.c > +++ b/qom/object_interfaces.c > @@ -8,18 +8,10 @@ > #include "qapi/opts-visitor.h" > #include "qemu/config-file.h" > =20 > -void user_creatable_complete(Object *obj, Error **errp) > +void user_creatable_complete(UserCreatable *uc, Error **errp) > { > + UserCreatableClass *ucc =3D USER_CREATABLE_GET_CLASS(uc); > =20 > - UserCreatableClass *ucc; > - UserCreatable *uc =3D > - (UserCreatable *)object_dynamic_cast(obj, TYPE_USER_CREATABLE); > - > - if (!uc) { > - return; > - } > - > - ucc =3D USER_CREATABLE_GET_CLASS(uc); > if (ucc->complete) { > ucc->complete(uc, errp); > } > @@ -89,7 +81,7 @@ Object *user_creatable_add_type(const char *type, const= char *id, > goto out; > } > =20 > - user_creatable_complete(obj, &local_err); > + user_creatable_complete(USER_CREATABLE(obj), &local_err); > if (local_err) { > object_property_del(object_get_objects_root(), > id, &error_abort);