From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:35383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2vM-0005Yi-Hn for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:52:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd2vI-0006Ui-DY for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:52:20 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:41618 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd2vI-0006US-25 for qemu-devel@nongnu.org; Tue, 20 Dec 2011 11:52:16 -0500 From: Anthony Liguori Date: Tue, 20 Dec 2011 10:51:36 -0600 Message-Id: <1324399916-21315-8-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1324399916-21315-1-git-send-email-aliguori@us.ibm.com> References: <1324399916-21315-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 07/27] qdev: add a interface to register subclasses List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Anthony Liguori , Markus Armbruster In order to introduce inheritance while still using the qdev registration interfaces, we need to be able to use a parent other than TYPE_DEVICE. Add a new interface that allows this. Signed-off-by: Anthony Liguori --- hw/qdev.c | 9 +++++++-- hw/qdev.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 3a7c98f..40ca081 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -61,7 +61,7 @@ DeviceInfo *qdev_get_info(DeviceState *dev) return DEVICE_GET_CLASS(dev)->info; } -void qdev_register(DeviceInfo *info) +void qdev_register_subclass(DeviceInfo *info, const char *parent) { TypeInfo type_info = {}; @@ -69,7 +69,7 @@ void qdev_register(DeviceInfo *info) assert(!info->next); type_info.name = info->name; - type_info.parent = TYPE_DEVICE; + type_info.parent = parent; type_info.instance_size = info->size; type_info.class_init = qdev_subclass_init; type_info.class_data = info; @@ -80,6 +80,11 @@ void qdev_register(DeviceInfo *info) device_info_list = info; } +void qdev_register(DeviceInfo *info) +{ + qdev_register_subclass(info, TYPE_DEVICE); +} + static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name) { DeviceInfo *info; diff --git a/hw/qdev.h b/hw/qdev.h index c1fcf28..c366174 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -240,6 +240,7 @@ struct DeviceInfo { extern DeviceInfo *device_info_list; void qdev_register(DeviceInfo *info); +void qdev_register_subclass(DeviceInfo *info, const char *parent); /* Register device properties. */ /* GPIO inputs also double as IRQ sinks. */ -- 1.7.4.1