From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gH6XD-0001Ma-EM for qemu-devel@nongnu.org; Mon, 29 Oct 2018 08:20:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gH6X9-0001Br-ES for qemu-devel@nongnu.org; Mon, 29 Oct 2018 08:20:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gH6X9-0001BG-7X for qemu-devel@nongnu.org; Mon, 29 Oct 2018 08:20:39 -0400 Date: Mon, 29 Oct 2018 13:20:30 +0100 From: Igor Mammedov Message-ID: <20181029132030.431ea221@redhat.com> In-Reply-To: <20180912125531.32131-7-marcandre.lureau@redhat.com> References: <20180912125531.32131-1-marcandre.lureau@redhat.com> <20180912125531.32131-7-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 6/9] qom/object: set globals when initializing object 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 , Eduardo Habkost , Marcel Apfelbaum , dgilbert@redhat.com, Richard Henderson , Andreas =?UTF-8?B?RsOkcmJlcg==?= , "Michael S. Tsirkin" , Artyom Tarasenko , Mark Cave-Ayland On Wed, 12 Sep 2018 16:55:28 +0400 Marc-Andr=C3=A9 Lureau wrote: > Set globals for all objects, although only TYPE_DEVICE & > TYPE_USER_CREATABLE can have globals for now. >=20 > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > hw/core/qdev.c | 6 ------ > qom/object.c | 2 ++ > 2 files changed, 2 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 473060b551..28c6c8d7c9 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -974,11 +974,6 @@ static void device_initfn(Object *obj) > QLIST_INIT(&dev->gpios); > } > =20 > -static void device_post_init(Object *obj) > -{ > - object_property_set_globals(obj); > -} > - > /* Unlink device from bus and free the structure. */ > static void device_finalize(Object *obj) > { > @@ -1103,7 +1098,6 @@ static const TypeInfo device_type_info =3D { > .parent =3D TYPE_OBJECT, > .instance_size =3D sizeof(DeviceState), > .instance_init =3D device_initfn, > - .instance_post_init =3D device_post_init, > .instance_finalize =3D device_finalize, > .class_base_init =3D device_class_base_init, > .class_init =3D device_class_init, > diff --git a/qom/object.c b/qom/object.c > index 0703e8e4ff..025ad0e191 100644 > --- a/qom/object.c > +++ b/qom/object.c > @@ -12,6 +12,7 @@ > =20 > #include "qemu/osdep.h" > #include "qapi/error.h" > +#include "qom/globals.h" > #include "qom/object.h" > #include "qom/object_interfaces.h" > #include "qemu/cutils.h" > @@ -382,6 +383,7 @@ static void object_initialize_with_type(void *data, s= ize_t size, TypeImpl *type) > obj->properties =3D g_hash_table_new_full(g_str_hash, g_str_equal, > NULL, object_property_free); > object_init_with_type(obj, type); > + object_property_set_globals(obj); > object_post_init_with_type(obj, type); this would somewhat inverse post_init call chain, if there weren't any other instance_post_init() users that would be fine but it potentially can break arm_cpu_post_init() since globals would be set before the later finishes creating per instance properties. arm cpu feature setting code is spread across initfn/post_init/realize and it's unreadable mess. Maybe we should get rid of instance_post_init() altogether and explicitly call arm_cpu_post_init() from each initfn(). > } > =20