From patchwork Mon Jan 30 21:08:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 138660 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7B79AB6EF2 for ; Tue, 31 Jan 2012 09:06:02 +1100 (EST) Received: from localhost ([::1]:56248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RryTv-0002FD-OT for incoming@patchwork.ozlabs.org; Mon, 30 Jan 2012 16:09:43 -0500 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 Received: from localhost6.localdomain6 (localhost.localdomain [127.0.0.1]) by localhost6.localdomain6 (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id q0UL97Hc005989; Mon, 30 Jan 2012 15:09:08 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id q0UL97eV005983; Mon, 30 Jan 2012 15:09:07 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Mon, 30 Jan 2012 15:08:43 -0600 Message-Id: <1327957741-5842-5-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> References: <1327957741-5842-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 70.123.132.139 Cc: Paolo Bonzini , Andreas Faerber , Anthony Liguori , Peter Maydell Subject: [Qemu-devel] [PATCH 05/23] qdev: allow classes to overload qdev functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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));