From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RryTW-0001gO-SN for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RryTP-00050y-25 for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:18 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:34268 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RryTO-00050u-RV for qemu-devel@nongnu.org; Mon, 30 Jan 2012 16:09:11 -0500 From: Anthony Liguori Date: Mon, 30 Jan 2012 15:08:43 -0600 Message-Id: <1327957741-5842-5-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> References: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 05/23] qdev: allow classes to overload qdev functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andreas Faerber , Anthony Liguori , Peter Maydell This allows us to drop per-Device registration functions by allowing the class_init functions to overload qdev methods. Signed-off-by: Anthony Liguori --- hw/qdev.c | 53 +++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 20 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index b273cd2..c9f890c 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -50,21 +50,39 @@ static void qdev_subclass_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); DeviceInfo *info = data; - dc->fw_name = info->fw_name; - dc->alias = info->alias; - dc->desc = info->desc; - dc->props = info->props; - dc->no_user = info->no_user; - - dc->reset = info->reset; - - dc->vmsd = info->vmsd; - - dc->init = info->init; - dc->unplug = info->unplug; - dc->exit = info->exit; - dc->bus_info = info->bus_info; - + if (info->fw_name) { + dc->fw_name = info->fw_name; + } + if (info->alias) { + dc->alias = info->alias; + } + if (info->desc) { + dc->desc = info->desc; + } + if (info->props) { + dc->props = info->props; + } + if (info->no_user) { + dc->no_user = info->no_user; + } + if (info->reset) { + dc->reset = info->reset; + } + if (info->vmsd) { + dc->vmsd = info->vmsd; + } + if (info->init) { + dc->init = info->init; + } + if (info->unplug) { + dc->unplug = info->unplug; + } + if (info->exit) { + dc->exit = info->exit; + } + if (info->bus_info) { + dc->bus_info = info->bus_info; + } if (info->class_init) { info->class_init(klass, data); } @@ -131,8 +149,6 @@ static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name) /* first check device names */ for (info = device_info_list; info != NULL; info = info->next) { - if (bus_info && info->bus_info != bus_info) - continue; if (strcmp(info->name, name) != 0) continue; return info; @@ -140,8 +156,6 @@ static DeviceInfo *qdev_find_info(BusInfo *bus_info, const char *name) /* failing that check the aliases */ for (info = device_info_list; info != NULL; info = info->next) { - if (bus_info && info->bus_info != bus_info) - continue; if (!info->alias) continue; if (strcmp(info->alias, name) != 0) @@ -164,7 +178,6 @@ static DeviceState *qdev_create_from_info(BusState *bus, DeviceInfo *info) DeviceState *dev; Property *prop; - assert(bus->info == info->bus_info); dev = DEVICE(object_new(info->name)); dev->parent_bus = bus; qdev_prop_set_defaults(dev, qdev_get_props(dev)); -- 1.7.4.1