[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/50] qdev: Hide "no_user" devices from users
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 25/50] qdev: Hide "no_user" devices from users |
Date: |
Thu, 4 Mar 2010 16:56:46 +0100 |
Users can't create them, so qdev_device_help() shouldn't list them.
Fix that.
Also make qdev_device_add() pretend they don't exist. Before, it
rejected them with a "can't be added via command line" message, which
wasn't quite right for monitor command device_add.
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/qdev.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 7bc711b..5ebf013 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -162,6 +162,9 @@ int qdev_device_help(QemuOpts *opts)
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);
}
return 1;
@@ -197,15 +200,10 @@ DeviceState *qdev_device_add(QemuOpts *opts)
/* find driver */
info = qdev_find_info(NULL, driver);
- if (!info) {
+ if (!info || info->no_user) {
qerror_report(QERR_DEVICE_NOT_FOUND, driver);
return NULL;
}
- if (info->no_user) {
- error_report("device \"%s\" can't be added via command line",
- info->name);
- return NULL;
- }
/* find bus */
path = qemu_opt_get(opts, "bus");
--
1.6.6.1
- [Qemu-devel] Re: [PATCH 28/50] error: Let converted handlers print in human monitor, (continued)
[Qemu-devel] [PATCH 44/50] error: Convert do_device_add() to QError, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 37/50] qdev: Convert qbus_find() to QError, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 43/50] Revert "qdev: Use QError for 'device not found' error", Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 33/50] qdev: Relax parsing of bus option, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 50/50] monitor: convert do_device_add() to QObject, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 27/50] monitor: New monitor_cur_is_qmp(), Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 30/50] error: New QERR_PROPERTY_NOT_FOUND, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 25/50] qdev: Hide "no_user" devices from users,
Markus Armbruster <=
[Qemu-devel] [PATCH 36/50] error: New QERR_DEVICE_NO_BUS, Markus Armbruster, 2010/03/04
[Qemu-devel] [PATCH 17/50] error: Rename qemu_error_new() to qerror_report(), Markus Armbruster, 2010/03/04
[Qemu-devel] [PULL v2] Convert device_add to QObject / QError, Markus Armbruster, 2010/03/16