From patchwork Mon Dec 12 20:18:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 130845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 038781007D4 for ; Tue, 13 Dec 2011 08:04:34 +1100 (EST) Received: from localhost ([::1]:37729 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaD31-0004WK-00 for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 16:04:31 -0500 Received: from eggs.gnu.org ([140.186.70.92]:42131) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCQy-0007jA-SK for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaCQx-0001Mr-3Q for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:12 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:55890 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaCQw-0001Mj-NR for qemu-devel@nongnu.org; Mon, 12 Dec 2011 15:25:11 -0500 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id pBCKP4pb032740; Mon, 12 Dec 2011 14:25:04 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id pBCKP2OL032735; Mon, 12 Dec 2011 14:25:02 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 12 Dec 2011 14:18:37 -0600 Message-Id: <1323721273-32404-42-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> References: <1323721273-32404-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Stefan Hajnoczi , Jan Kiszka , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 041/197] add class_init to deviceinfo X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- hw/ccid.h | 2 +- hw/qdev.c | 4 ++++ hw/qdev.h | 5 +++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/hw/ccid.h b/hw/ccid.h index ad055d3..d8e0485 100644 --- a/hw/ccid.h +++ b/hw/ccid.h @@ -17,7 +17,7 @@ typedef struct CCIDCardInfo CCIDCardInfo; #define TYPE_CCID_CARD "ccid-card" #define CCID_CARD(obj) \ - OBJECT_CHECK(CCIDCard, (obj), TYPE_CCID_CARD) + OBJECT_CHECK(CCIDCardState, (obj), TYPE_CCID_CARD) #define CCID_CARD_CLASS(klass) \ OBJECT_CLASS_CHECK(CCIDCardClass, (klass), TYPE_CCID_CARD) #define CCID_CARD_GET_CLASS(obj) \ diff --git a/hw/qdev.c b/hw/qdev.c index 09f8b4c..d062470 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 aab8f42..6617a2b 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -225,6 +225,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;