From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:51568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhscN-00013R-PH for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:52:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RhscM-0008I5-Ak for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:52:43 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:54353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RhscM-0008Ht-3Z for qemu-devel@nongnu.org; Mon, 02 Jan 2012 19:52:42 -0500 Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 2 Jan 2012 19:52:41 -0500 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q030qdlm2658448 for ; Mon, 2 Jan 2012 19:52:39 -0500 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q030qcxT001669 for ; Mon, 2 Jan 2012 22:52:38 -0200 From: Anthony Liguori Date: Mon, 2 Jan 2012 18:52:02 -0600 Message-Id: <1325551939-24749-14-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com> References: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 13/30] qdev: add class_init to DeviceInfo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= Since we are still dynamically creating TypeInfo, we need to chain the class_init function in order to be able to make use of it within subclasses of TYPE_DEVICE. This will disappear once we register TypeInfos directly. Signed-off-by: Anthony Liguori --- hw/qdev.c | 4 ++++ hw/qdev.h | 5 +++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 7c4d3ca..c6a6d20 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -54,6 +54,10 @@ static void qdev_subclass_init(ObjectClass *klass, void *data) /* Poison to try to detect future uses */ dc->info->reset = NULL; + + if (dc->info->class_init) { + dc->info->class_init(klass, data); + } } DeviceInfo *qdev_get_info(DeviceState *dev) diff --git a/hw/qdev.h b/hw/qdev.h index 742f421..6e86826 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -230,6 +230,11 @@ struct DeviceInfo { /* device state */ const VMStateDescription *vmsd; + /** + * See #TypeInfo::class_init() + */ + void (*class_init)(ObjectClass *klass, void *data); + /* Private to qdev / bus. */ qdev_initfn init; qdev_event unplug; -- 1.7.4.1