From patchwork Wed Feb 1 19:50:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 138988 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 315B8B6F99 for ; Thu, 2 Feb 2012 07:33:10 +1100 (EST) Received: from localhost ([::1]:56848 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsgDs-0001Mh-01 for incoming@patchwork.ozlabs.org; Wed, 01 Feb 2012 14:52:04 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsgDe-0000ty-M9 for qemu-devel@nongnu.org; Wed, 01 Feb 2012 14:51:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RsgDW-000646-Pj for qemu-devel@nongnu.org; Wed, 01 Feb 2012 14:51:47 -0500 Received: from cpe-70-123-132-139.austin.res.rr.com ([70.123.132.139]:52893 helo=localhost6.localdomain6) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsgDW-00063w-IW for qemu-devel@nongnu.org; Wed, 01 Feb 2012 14:51:42 -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 q11JpbDC006354; Wed, 1 Feb 2012 13:51:37 -0600 Received: (from anthony@localhost) by localhost6.localdomain6 (8.14.4/8.14.4/Submit) id q11Jpa7e006352; Wed, 1 Feb 2012 13:51:36 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Wed, 1 Feb 2012 13:50:49 -0600 Message-Id: <1328125863-6203-9-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1328125863-6203-1-git-send-email-aliguori@us.ibm.com> References: <1328125863-6203-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 , Anthony Liguori , Andreas Faerber , Peter Maydell Subject: [Qemu-devel] [PATCH 08/22] qdev: kill off DeviceInfo list 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 Teach the various bits of code that need to walk through available devices to do so via QOM. Signed-off-by: Anthony Liguori --- hw/qdev.c | 87 +++++++++++++++++++++---------------------------------------- hw/qdev.h | 2 - hw/ssi.c | 2 +- 3 files changed, 31 insertions(+), 60 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index bba84e2..a30a1c2 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -38,8 +38,6 @@ static bool qdev_hot_removed = false; static BusState *main_system_bus; static void main_system_bus_create(void); -DeviceInfo *device_info_list; - static BusState *qbus_find_recursive(BusState *bus, const char *name, const BusInfo *info); static BusState *qbus_find(const char *path); @@ -125,7 +123,6 @@ static void qdev_do_register_subclass(DeviceInfo *info, const char *parent, TypeInfo type_info = {}; assert(info->size >= sizeof(DeviceState)); - assert(!info->next); type_info.name = name; type_info.parent = parent; @@ -142,40 +139,11 @@ void qdev_register_subclass(DeviceInfo *info, const char *parent) if (info->alias) { qdev_do_register_subclass(info, parent, info->alias); } - info->next = device_info_list; - 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; - - /* first check device names */ - for (info = device_info_list; info != NULL; info = info->next) { - if (strcmp(info->name, name) != 0) - continue; - return info; - } - - /* failing that check the aliases */ - for (info = device_info_list; info != NULL; info = info->next) { - if (!info->alias) - continue; - if (strcmp(info->alias, name) != 0) - continue; - return info; - } - return NULL; } bool qdev_exists(const char *name) { - return !!qdev_find_info(NULL, name); + return !!object_class_by_name(name); } static void qdev_property_add_legacy(DeviceState *dev, Property *prop, @@ -245,17 +213,28 @@ DeviceState *qdev_try_create(BusState *bus, const char *name) return qdev_create_from_info(bus, name); } -static void qdev_print_devinfo(DeviceInfo *info) +static void qdev_print_devinfo(ObjectClass *klass, void *opaque) { - error_printf("name \"%s\", bus %s", - info->name, info->bus_info->name); - if (info->alias) { - error_printf(", alias \"%s\"", info->alias); + DeviceClass *dc; + bool *show_no_user = opaque; + + dc = (DeviceClass *)object_class_dynamic_cast(klass, TYPE_DEVICE); + + if (!dc || (show_no_user && !*show_no_user && dc->no_user)) { + return; } - if (info->desc) { - error_printf(", desc \"%s\"", info->desc); + + error_printf("name \"%s\"", object_class_get_name(klass)); + if (dc->bus_info) { + error_printf(", bus %s", dc->bus_info->name); } - if (info->no_user) { + if (dc->alias) { + error_printf(", alias \"%s\"", dc->alias); + } + if (dc->desc) { + error_printf(", desc \"%s\"", dc->desc); + } + if (dc->no_user) { error_printf(", no-user"); } error_printf("\n"); @@ -279,17 +258,14 @@ static int set_property(const char *name, const char *value, void *opaque) int qdev_device_help(QemuOpts *opts) { const char *driver; - DeviceInfo *info; Property *prop; + ObjectClass *klass; + DeviceClass *info; driver = qemu_opt_get(opts, "driver"); if (driver && !strcmp(driver, "?")) { - for (info = device_info_list; info != NULL; info = info->next) { - if (info->no_user) { - continue; /* not available, don't show */ - } - qdev_print_devinfo(info); - } + bool show_no_user = false; + object_class_foreach(qdev_print_devinfo, TYPE_DEVICE, false, &show_no_user); return 1; } @@ -297,10 +273,11 @@ int qdev_device_help(QemuOpts *opts) return 0; } - info = qdev_find_info(NULL, driver); - if (!info) { + klass = object_class_by_name(driver); + if (!klass) { return 0; } + info = DEVICE_CLASS(klass); for (prop = info->props; prop && prop->name; prop++) { /* @@ -312,14 +289,14 @@ int qdev_device_help(QemuOpts *opts) if (!prop->info->parse) { continue; /* no way to set it, don't show */ } - error_printf("%s.%s=%s\n", info->name, prop->name, + error_printf("%s.%s=%s\n", driver, prop->name, prop->info->legacy_name ?: prop->info->name); } for (prop = info->bus_info->props; prop && prop->name; prop++) { if (!prop->info->parse) { continue; /* no way to set it, don't show */ } - error_printf("%s.%s=%s\n", info->name, prop->name, + error_printf("%s.%s=%s\n", driver, prop->name, prop->info->legacy_name ?: prop->info->name); } return 1; @@ -1085,11 +1062,7 @@ void do_info_qtree(Monitor *mon) void do_info_qdm(Monitor *mon) { - DeviceInfo *info; - - for (info = device_info_list; info != NULL; info = info->next) { - qdev_print_devinfo(info); - } + object_class_foreach(qdev_print_devinfo, TYPE_DEVICE, false, NULL); } int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) diff --git a/hw/qdev.h b/hw/qdev.h index 7e4c632..05ebf7e 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -257,9 +257,7 @@ struct DeviceInfo { qdev_event unplug; qdev_event exit; BusInfo *bus_info; - struct DeviceInfo *next; }; -extern DeviceInfo *device_info_list; void qdev_register(DeviceInfo *info); void qdev_register_subclass(DeviceInfo *info, const char *parent); diff --git a/hw/ssi.c b/hw/ssi.c index 99a0616..994c922 100644 --- a/hw/ssi.c +++ b/hw/ssi.c @@ -41,7 +41,7 @@ void ssi_register_slave(DeviceInfo *info) assert(info->size >= sizeof(SSISlave)); info->init = ssi_slave_init; info->bus_info = &ssi_bus_info; - qdev_register(info); + qdev_register_subclass(info, TYPE_SSI_SLAVE); } DeviceState *ssi_create_slave(SSIBus *bus, const char *name)