218e99
From c028066b7a4a68d52a33f6856bb8fe907def2b6b Mon Sep 17 00:00:00 2001
218e99
From: Kevin Wolf <kwolf@redhat.com>
218e99
Date: Wed, 6 Nov 2013 14:41:10 +0100
218e99
Subject: [PATCH 34/81] Mostly revert "qemu-help: Sort devices by logical functionality"
218e99
218e99
RH-Author: Kevin Wolf <kwolf@redhat.com>
218e99
Message-id: <1383748882-22831-6-git-send-email-kwolf@redhat.com>
218e99
Patchwork-id: 55531
218e99
O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 05/17] Mostly revert "qemu-help: Sort devices by logical functionality"
218e99
Bugzilla: 1001216
218e99
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
218e99
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
218e99
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
218e99
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
218e99
From: Markus Armbruster <armbru@redhat.com>
218e99
218e99
This reverts most of commit 3d1237fb2ab4edb926c717767bb5e31d6053a7c5.
218e99
218e99
The commit claims to sort the output of "-device help" "by
218e99
functionality rather than alphabetical".  Issues:
218e99
218e99
* The output was unsorted before, not alphabetically sorted.
218e99
  Misleading, but harmless enough.
218e99
218e99
* The commit doesn't just sort the output of "-device help" as it
218e99
  claims, it adds categories to each line of "-device help", and it
218e99
  prints devices once per category.  In particular, devices without a
218e99
  category aren't shown anymore.  Maybe such devices should not exist,
218e99
  but they do.  Regression.
218e99
218e99
* Categories are also added to the output of "info qdm".  Silent
218e99
  change, not nice.  Output remains unsorted, unlike "-device help".
218e99
218e99
I'm going to reimplement the feature we actually want, without the
218e99
warts.  Reverting the flawed commit first should make it easier to
218e99
review.  However, I can't revert it completely, since DeviceClass
218e99
member categories has been put to use.  So leave that part in.
218e99
218e99
Signed-off-by: Markus Armbruster <armbru@redhat.com>
218e99
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
218e99
Message-id: 1381410021-1538-2-git-send-email-armbru@redhat.com
218e99
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
218e99
(cherry picked from commit 1fc224b4b6d195fb7802d5ba1a0846a4e7a1e2af)
218e99
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
218e99
---
218e99
 include/hw/qdev-core.h | 16 ----------------
218e99
 qdev-monitor.c         | 48 +++++++++---------------------------------------
218e99
 2 files changed, 9 insertions(+), 55 deletions(-)
218e99
218e99
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
218e99
---
218e99
 include/hw/qdev-core.h |   16 ----------------
218e99
 qdev-monitor.c         |   48 +++++++++---------------------------------------
218e99
 2 files changed, 9 insertions(+), 55 deletions(-)
218e99
218e99
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
218e99
index 18596e9..a8618db 100644
218e99
--- a/include/hw/qdev-core.h
218e99
+++ b/include/hw/qdev-core.h
218e99
@@ -30,22 +30,6 @@ typedef enum DeviceCategory {
218e99
     DEVICE_CATEGORY_MAX
218e99
 } DeviceCategory;
218e99
 
218e99
-static inline const char *qdev_category_get_name(DeviceCategory category)
218e99
-{
218e99
-    static const char *category_names[DEVICE_CATEGORY_MAX] = {
218e99
-        [DEVICE_CATEGORY_BRIDGE]  = "Controller/Bridge/Hub",
218e99
-        [DEVICE_CATEGORY_USB]     = "USB",
218e99
-        [DEVICE_CATEGORY_STORAGE] = "Storage",
218e99
-        [DEVICE_CATEGORY_NETWORK] = "Network",
218e99
-        [DEVICE_CATEGORY_INPUT]   = "Input",
218e99
-        [DEVICE_CATEGORY_DISPLAY] = "Display",
218e99
-        [DEVICE_CATEGORY_SOUND]   = "Sound",
218e99
-        [DEVICE_CATEGORY_MISC]    = "Misc",
218e99
-    };
218e99
-
218e99
-    return category_names[category];
218e99
-};
218e99
-
218e99
 typedef int (*qdev_initfn)(DeviceState *dev);
218e99
 typedef int (*qdev_event)(DeviceState *dev);
218e99
 typedef void (*qdev_resetfn)(DeviceState *dev);
218e99
diff --git a/qdev-monitor.c b/qdev-monitor.c
218e99
index 230a8df..e54dbc2 100644
218e99
--- a/qdev-monitor.c
218e99
+++ b/qdev-monitor.c
218e99
@@ -75,27 +75,24 @@ static bool qdev_class_has_alias(DeviceClass *dc)
218e99
     return (qdev_class_get_alias(dc) != NULL);
218e99
 }
218e99
 
218e99
-static void qdev_print_class_devinfo(DeviceClass *dc)
218e99
+static void qdev_print_devinfo(ObjectClass *klass, void *opaque)
218e99
 {
218e99
-    DeviceCategory category;
218e99
+    DeviceClass *dc;
218e99
+    bool *show_no_user = opaque;
218e99
+
218e99
+    dc = (DeviceClass *)object_class_dynamic_cast(klass, TYPE_DEVICE);
218e99
 
218e99
-    if (!dc) {
218e99
+    if (!dc || (show_no_user && !*show_no_user && dc->no_user)) {
218e99
         return;
218e99
     }
218e99
 
218e99
-    error_printf("name \"%s\"", object_class_get_name(OBJECT_CLASS(dc)));
218e99
+    error_printf("name \"%s\"", object_class_get_name(klass));
218e99
     if (dc->bus_type) {
218e99
         error_printf(", bus %s", dc->bus_type);
218e99
     }
218e99
     if (qdev_class_has_alias(dc)) {
218e99
         error_printf(", alias \"%s\"", qdev_class_get_alias(dc));
218e99
     }
218e99
-    error_printf(", categories");
218e99
-    for (category = 0; category < DEVICE_CATEGORY_MAX; ++category) {
218e99
-        if (test_bit(category, dc->categories)) {
218e99
-            error_printf(" \"%s\"", qdev_category_get_name(category));
218e99
-        }
218e99
-    }
218e99
     if (dc->desc) {
218e99
         error_printf(", desc \"%s\"", dc->desc);
218e99
     }
218e99
@@ -105,15 +102,6 @@ static void qdev_print_class_devinfo(DeviceClass *dc)
218e99
     error_printf("\n");
218e99
 }
218e99
 
218e99
-static void qdev_print_devinfo(ObjectClass *klass, void *opaque)
218e99
-{
218e99
-    DeviceClass *dc;
218e99
-
218e99
-    dc = (DeviceClass *)object_class_dynamic_cast(klass, TYPE_DEVICE);
218e99
-
218e99
-    qdev_print_class_devinfo(dc);
218e99
-}
218e99
-
218e99
 static int set_property(const char *name, const char *value, void *opaque)
218e99
 {
218e99
     DeviceState *dev = opaque;
218e99
@@ -151,21 +139,6 @@ static const char *find_typename_by_alias(const char *alias)
218e99
     return NULL;
218e99
 }
218e99
 
218e99
-static void qdev_print_category_devices(DeviceCategory category)
218e99
-{
218e99
-    DeviceClass *dc;
218e99
-    GSList *list, *curr;
218e99
-
218e99
-    list = object_class_get_list(TYPE_DEVICE, false);
218e99
-    for (curr = list; curr; curr = g_slist_next(curr)) {
218e99
-        dc = (DeviceClass *)object_class_dynamic_cast(curr->data, TYPE_DEVICE);
218e99
-        if (!dc->no_user && test_bit(category, dc->categories)) {
218e99
-            qdev_print_class_devinfo(dc);
218e99
-        }
218e99
-    }
218e99
-    g_slist_free(list);
218e99
-}
218e99
-
218e99
 int qdev_device_help(QemuOpts *opts)
218e99
 {
218e99
     const char *driver;
218e99
@@ -174,11 +147,8 @@ int qdev_device_help(QemuOpts *opts)
218e99
 
218e99
     driver = qemu_opt_get(opts, "driver");
218e99
     if (driver && is_help_option(driver)) {
218e99
-        DeviceCategory category;
218e99
-        for (category = 0; category < DEVICE_CATEGORY_MAX; ++category) {
218e99
-            qdev_print_category_devices(category);
218e99
-        }
218e99
-
218e99
+        bool show_no_user = false;
218e99
+        object_class_foreach(qdev_print_devinfo, TYPE_DEVICE, false, &show_no_user);
218e99
         return 1;
218e99
     }
218e99
 
218e99
-- 
218e99
1.7.1
218e99