From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcUt-0001dF-Nq for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SgcUW-0003Ww-Pz for qemu-devel@nongnu.org; Mon, 18 Jun 2012 10:00:03 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53246 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SgcUW-0003WJ-GR for qemu-devel@nongnu.org; Mon, 18 Jun 2012 09:59:40 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 18 Jun 2012 15:59:02 +0200 Message-Id: <1340027954-19045-11-git-send-email-afaerber@suse.de> In-Reply-To: <1340027954-19045-1-git-send-email-afaerber@suse.de> References: <1340027954-19045-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 10/22] qdev: Push "type" property up to Object List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori From: Paolo Bonzini Now that Object is a type, add an instance_init function and push the "type" property from qdev to there. Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hw/qdev.c | 6 ------ qom/object.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 6a8f6bd..a9a9f89 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -515,11 +515,6 @@ char* qdev_get_fw_dev_path(DeviceState *dev) return strdup(path); } =20 -static char *qdev_get_type(Object *obj, Error **errp) -{ - return g_strdup(object_get_typename(obj)); -} - /** * Legacy property handling */ @@ -638,7 +633,6 @@ static void device_initfn(Object *obj) qdev_property_add_static(dev, prop, NULL); } =20 - object_property_add_str(OBJECT(dev), "type", qdev_get_type, NULL, NU= LL); qdev_prop_set_defaults(dev, qdev_get_props(dev)); } =20 diff --git a/qom/object.c b/qom/object.c index cec2d40..d5c6ff7 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1231,6 +1231,16 @@ void object_property_add_str(Object *obj, const ch= ar *name, prop, errp); } =20 +static char *qdev_get_type(Object *obj, Error **errp) +{ + return g_strdup(object_get_typename(obj)); +} + +static void object_instance_init(Object *obj) +{ + object_property_add_str(obj, "type", qdev_get_type, NULL, NULL); +} + static void register_types(void) { static TypeInfo interface_info =3D { @@ -1242,6 +1252,7 @@ static void register_types(void) static TypeInfo object_info =3D { .name =3D TYPE_OBJECT, .instance_size =3D sizeof(Object), + .instance_init =3D object_instance_init, .abstract =3D true, }; =20 --=20 1.7.7