qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Anthony Liguori" <aliguori@us.ibm.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PATCH 13/30] qdev: add class_init to DeviceInfo
Date: Mon,  2 Jan 2012 18:52:02 -0600	[thread overview]
Message-ID: <1325551939-24749-14-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1325551939-24749-1-git-send-email-aliguori@us.ibm.com>

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 <aliguori@us.ibm.com>
---
 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

  parent reply	other threads:[~2012-01-03  0:52 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-03  0:51 [Qemu-devel] qom: add QEMU Object Model type hierarchy to qdev (v2) Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 01/30] macio: convert to qdev Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 02/30] openpic: remove dead code to make a PCI device version Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support Anthony Liguori
2012-01-05 15:16   ` François Revol
2012-01-13 10:59   ` Benjamin Herrenschmidt
2012-01-13 11:04     ` Andreas Färber
2012-01-13 11:45       ` Paolo Bonzini
2012-01-13 12:30         ` Alexander Graf
2012-01-13 14:24           ` Andreas Färber
2012-01-13 14:29             ` Alexander Graf
2012-01-03  0:51 ` [Qemu-devel] [PATCH 04/30] ppc_prep: convert host bridge to qdev Anthony Liguori
2012-01-03 14:57   ` Andreas Färber
2012-01-07  0:11     ` Andreas Färber
2012-01-03  0:51 ` [Qemu-devel] [PATCH 05/30] pseries: Remove hcalls callback Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 06/30] pci: call reset unconditionally Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 07/30] qom: add the base Object class (v2) Anthony Liguori
2012-01-03  9:02   ` Paolo Bonzini
2012-01-03  0:51 ` [Qemu-devel] [PATCH 08/30] qdev: integrate with QEMU Object Model (v2) Anthony Liguori
2012-01-03  0:51 ` [Qemu-devel] [PATCH 09/30] qdev: move qdev->info to class Anthony Liguori
2012-01-08  2:27   ` Andreas Färber
2012-01-03  0:51 ` [Qemu-devel] [PATCH 10/30] qdev: don't access name through info Anthony Liguori
2012-01-03  9:06   ` Paolo Bonzini
2012-01-03 13:39     ` Anthony Liguori
2012-01-03 13:41       ` Paolo Bonzini
2012-01-03  0:52 ` [Qemu-devel] [PATCH 11/30] qdev: use a wrapper to access reset and promote reset to a class method Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 12/30] qdev: add a interface to register subclasses Anthony Liguori
2012-01-03  0:52 ` Anthony Liguori [this message]
2012-01-03  0:52 ` [Qemu-devel] [PATCH 14/30] qdev: prepare source tree for code conversion Anthony Liguori
2012-01-04 14:07   ` Andreas Färber
2012-01-04 14:24     ` Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 15/30] isa: convert to QEMU Object Model Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 16/30] usb: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 17/30] ccid: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 18/30] ssi: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 19/30] i2c: rename i2c_slave -> I2CSlave Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 20/30] i2c: smbus: convert to QEMU Object Model Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 21/30] hda-codec: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 22/30] ide: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 23/30] scsi: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 24/30] spapr: convert to QEMU Object Model (v2) Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 25/30] virtio-serial: convert to QEMU Object Model Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 26/30] grackle: remove broken pci device Anthony Liguori
2012-01-08  1:46   ` Aurelien Jarno
2012-01-08  1:55     ` Andreas Färber
2012-01-03  0:52 ` [Qemu-devel] [PATCH 27/30] unin_pci: remove phantom qdev devices in unin_pci Anthony Liguori
2012-01-08  2:04   ` Andreas Färber
2012-01-03  0:52 ` [Qemu-devel] [PATCH 28/30] pci: convert to QEMU Object Model Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 29/30] sysbus: " Anthony Liguori
2012-01-03  0:52 ` [Qemu-devel] [PATCH 30/30] virtio-s390: " Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1325551939-24749-14-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=afaerber@suse.de \
    --cc=armbru@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).