From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPIO0-0001gH-Dy for qemu-devel@nongnu.org; Tue, 01 May 2012 15:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPINy-0002mH-JC for qemu-devel@nongnu.org; Tue, 01 May 2012 15:05:20 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35675 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPINy-0002m6-AM for qemu-devel@nongnu.org; Tue, 01 May 2012 15:05:18 -0400 Message-ID: <4FA033EC.1050800@suse.de> Date: Tue, 01 May 2012 21:05:16 +0200 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1335896294-9530-1-git-send-email-aliguori@us.ibm.com> <1335896294-9530-4-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1335896294-9530-4-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 03/14] qdev: add qdev_add_properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Wanpeng Li , Peter Maydell , qemu-devel@nongnu.org, Paolo Bonzini Am 01.05.2012 20:18, schrieb Anthony Liguori: > This allows a base class to easily add properties. >=20 > Signed-off-by: Anthony Liguori Implementation looks okay but /me not so happy with it: This conflicts with the move of the qdev static property infrastructure from DeviceState to Object. Consider rebasing this onto part of Paolo's series and call it object_add_properties? Andreas > --- > hw/qdev.c | 25 ++++++++++++------------- > hw/qdev.h | 2 ++ > 2 files changed, 14 insertions(+), 13 deletions(-) >=20 > diff --git a/hw/qdev.c b/hw/qdev.c > index 6a8f6bd..e17a9ab 100644 > --- a/hw/qdev.c > +++ b/hw/qdev.c > @@ -76,22 +76,26 @@ bool qdev_exists(const char *name) > static void qdev_property_add_legacy(DeviceState *dev, Property *prop, > Error **errp); > =20 > -void qdev_set_parent_bus(DeviceState *dev, BusState *bus) > +void qdev_add_properties(DeviceState *dev, Property *props) > { > Property *prop; > =20 > + for (prop =3D props; prop && prop->name; prop++) { > + qdev_property_add_legacy(dev, prop, NULL); > + qdev_property_add_static(dev, prop, NULL); > + } > + qdev_prop_set_defaults(dev, props); > +} > + > +void qdev_set_parent_bus(DeviceState *dev, BusState *bus) > +{ > if (qdev_hotplug) { > assert(bus->allow_hotplug); > } > =20 > dev->parent_bus =3D bus; > QTAILQ_INSERT_HEAD(&bus->children, dev, sibling); > - > - for (prop =3D qdev_get_bus_info(dev)->props; prop && prop->name; p= rop++) { > - qdev_property_add_legacy(dev, prop, NULL); > - qdev_property_add_static(dev, prop, NULL); > - } > - qdev_prop_set_defaults(dev, dev->parent_bus->info->props); > + qdev_add_properties(dev, dev->parent_bus->info->props); > } > =20 > /* Create a new device. This only initializes the device state struct= ure > @@ -633,13 +637,8 @@ static void device_initfn(Object *obj) > dev->instance_id_alias =3D -1; > dev->state =3D DEV_STATE_CREATED; > =20 > - for (prop =3D qdev_get_props(dev); prop && prop->name; prop++) { > - qdev_property_add_legacy(dev, prop, NULL); > - qdev_property_add_static(dev, prop, NULL); > - } > - > + qdev_add_properties(dev, qdev_get_props(dev)); > object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, = NULL); > - qdev_prop_set_defaults(dev, qdev_get_props(dev)); > } > =20 > /* Unlink device from bus and free the structure. */ > diff --git a/hw/qdev.h b/hw/qdev.h > index 4e90119..ca8386a 100644 > --- a/hw/qdev.h > +++ b/hw/qdev.h > @@ -360,4 +360,6 @@ void qdev_set_parent_bus(DeviceState *dev, BusState= *bus); > =20 > extern int qdev_hotplug; > =20 > +void qdev_add_properties(DeviceState *dev, Property *props); > + > #endif --=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