From 3dde52d2fe5fd4783bdd06f88561cbd0695aae06 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Sun, 4 Dec 2011 14:37:06 -0600 Subject: [PATCH] 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 --- hw/qdev.c | 4 ++++ hw/qdev.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/hw/qdev.c b/hw/qdev.c index c4b5284fdc..81996bbc36 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 48f80a5cce..c9572a546c 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; -- GitLab