From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCAGE-0001CU-0E for qemu-devel@nongnu.org; Mon, 26 Mar 2012 09:47:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCAGB-0003fc-To for qemu-devel@nongnu.org; Mon, 26 Mar 2012 09:47:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41053 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCAGB-0003d0-N5 for qemu-devel@nongnu.org; Mon, 26 Mar 2012 09:46:59 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 26 Mar 2012 15:46:52 +0200 Message-Id: <1332769612-4247-4-git-send-email-afaerber@suse.de> In-Reply-To: <1332769612-4247-1-git-send-email-afaerber@suse.de> References: <1332769612-4247-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 RFC 3/3] qdev: Hook up DeviceClass::init to ObjectClass::realize 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 On realize, call the qdev init function. If that returns an error, raise QERR_DEVICE_INIT_FAILED. Signed-off-by: Andreas F=C3=A4rber Cc: Anthony Liguori Cc: Paolo Bonzini --- hw/qdev.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index ee21d90..c84b656 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -649,6 +649,13 @@ static void device_finalize(Object *obj) QTAILQ_REMOVE(&dev->parent_bus->children, dev, sibling); } =20 +static int device_realize(Object *obj) +{ + DeviceState *dev =3D DEVICE(obj); + + return qdev_init(dev); +} + void device_reset(DeviceState *dev) { DeviceClass *klass =3D DEVICE_GET_CLASS(dev); @@ -658,6 +665,11 @@ void device_reset(DeviceState *dev) } } =20 +static void device_class_init(ObjectClass *class, void *data) +{ + class->realize =3D device_realize; +} + static TypeInfo device_type_info =3D { .name =3D TYPE_DEVICE, .parent =3D TYPE_OBJECT, @@ -666,6 +678,7 @@ static TypeInfo device_type_info =3D { .instance_finalize =3D device_finalize, .abstract =3D true, .class_size =3D sizeof(DeviceClass), + .class_init =3D device_class_init, }; =20 static void qdev_register_types(void) --=20 1.7.7