From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rpm8c-0002aK-R8 for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:34:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rpm8Y-0004cI-Lf for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:34:38 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:45856) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rpm8Y-0004c7-Bq for qemu-devel@nongnu.org; Tue, 24 Jan 2012 14:34:34 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jan 2012 12:34:32 -0700 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 4790B3E40051 for ; Tue, 24 Jan 2012 12:33:41 -0700 (MST) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0OJXYaQ120384 for ; Tue, 24 Jan 2012 12:33:35 -0700 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0OJXYIE007975 for ; Tue, 24 Jan 2012 12:33:34 -0700 From: Anthony Liguori Date: Tue, 24 Jan 2012 13:33:01 -0600 Message-Id: <1327433600-7403-10-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> References: <1327433600-7403-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 09/28] 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: Anthony Liguori 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 a80ca7c..c4b5284 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 f3c9219..48f80a5 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -241,6 +241,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