diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-10-10 15:00:20 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-11 09:36:29 -0700 |
| commit | 1fc224b4b6d195fb7802d5ba1a0846a4e7a1e2af (patch) | |
| tree | 53c1eff702898a2f2009d840f51b04c10f8ca1d7 /include | |
| parent | 859389810910f232188675d2f10b15f1aad77660 (diff) | |
| download | qemu-1fc224b4b6d195fb7802d5ba1a0846a4e7a1e2af.zip qemu-1fc224b4b6d195fb7802d5ba1a0846a4e7a1e2af.tar.gz qemu-1fc224b4b6d195fb7802d5ba1a0846a4e7a1e2af.tar.bz2 | |
Mostly revert "qemu-help: Sort devices by logical functionality"
This reverts most of commit 3d1237fb2ab4edb926c717767bb5e31d6053a7c5.
The commit claims to sort the output of "-device help" "by
functionality rather than alphabetical". Issues:
* The output was unsorted before, not alphabetically sorted.
Misleading, but harmless enough.
* The commit doesn't just sort the output of "-device help" as it
claims, it adds categories to each line of "-device help", and it
prints devices once per category. In particular, devices without a
category aren't shown anymore. Maybe such devices should not exist,
but they do. Regression.
* Categories are also added to the output of "info qdm". Silent
change, not nice. Output remains unsorted, unlike "-device help".
I'm going to reimplement the feature we actually want, without the
warts. Reverting the flawed commit first should make it easier to
review. However, I can't revert it completely, since DeviceClass
member categories has been put to use. So leave that part in.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel.a@redhat.com>
Message-id: 1381410021-1538-2-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index a62f231..e191ca0 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -30,22 +30,6 @@ typedef enum DeviceCategory { DEVICE_CATEGORY_MAX } DeviceCategory; -static inline const char *qdev_category_get_name(DeviceCategory category) -{ - static const char *category_names[DEVICE_CATEGORY_MAX] = { - [DEVICE_CATEGORY_BRIDGE] = "Controller/Bridge/Hub", - [DEVICE_CATEGORY_USB] = "USB", - [DEVICE_CATEGORY_STORAGE] = "Storage", - [DEVICE_CATEGORY_NETWORK] = "Network", - [DEVICE_CATEGORY_INPUT] = "Input", - [DEVICE_CATEGORY_DISPLAY] = "Display", - [DEVICE_CATEGORY_SOUND] = "Sound", - [DEVICE_CATEGORY_MISC] = "Misc", - }; - - return category_names[category]; -}; - typedef int (*qdev_initfn)(DeviceState *dev); typedef int (*qdev_event)(DeviceState *dev); typedef void (*qdev_resetfn)(DeviceState *dev); |