[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 24/48] qdev: Hide "no_user" devices from users
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH RFC 24/48] qdev: Hide "no_user" devices from users |
Date: |
Wed, 24 Feb 2010 18:55:36 +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 e5f6820..274b052 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) {
qemu_error_new(QERR_DEVICE_NOT_FOUND, driver);
return NULL;
}
- if (info->no_user) {
- qemu_error("device \"%s\" can't be added via command line",
- info->name);
- return NULL;
- }
/* find bus */
path = qemu_opt_get(opts, "bus");
--
1.6.6
- [Qemu-devel] [PATCH RFC 00/48] Convert device_add to QObject / QError, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 02/48] error: Move qemu_error() & friends from monitor.c to own file, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 17/48] error: Infrastructure to track locations for error reporting, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 16/48] error: Don't abuse qemu_error() for non-error in qbus_find(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 21/48] error: Track locations on command line, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 28/48] error: New QERR_PROPERTY_VALUE_BAD, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 01/48] monitor: Factor monitor_set_error() out of qemu_error_internal(), Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 22/48] qdev: Fix -device and device_add to handle unsuitable bus gracefully, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 24/48] qdev: Hide "no_user" devices from users,
Markus Armbruster <=
- [Qemu-devel] [PATCH RFC 44/48] qemu-option: Move the implied first name into QemuOptsList, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 25/48] qdev: Hide "ptr" properties from users, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 46/48] monitor: New argument type 'O', Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 43/48] qemu-option: Functions to convert to/from QDict., Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 30/48] qdev: Relax parsing of bus option, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 13/48] error: Make qemu_error() add a newline, strip it from arguments, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 26/48] error: Polish human-readable error descriptions, Markus Armbruster, 2010/02/24
- [Qemu-devel] [PATCH RFC 42/48] error: Convert do_device_add() to QError, Markus Armbruster, 2010/02/24