From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sun, 4 Dec 2011 20:37:06 +0000 (-0600)
Subject: qdev: add class_init to DeviceInfo
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3dde52d2fe5fd4783bdd06f88561cbd0695aae06;p=qemu-xen-4.6-testing.git

qdev: add class_init to DeviceInfo

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>
---

diff --git a/hw/qdev.c b/hw/qdev.c
index c4b5284fd..81996bbc3 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 48f80a5cc..c9572a546 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -231,6 +231,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;