ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: Hide "no_user" devices from users 

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.
This commit is contained in:
Markus Armbruster 2010-02-19 13:31:49 +01:00
parent 0c17542d90
commit c64eafaf0c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/qdev.c
View File

@ -162,6 +162,9 @@ int qdev_device_help(QemuOpts *opts)
driver = qemu_opt_get(opts, "driver"); driver = qemu_opt_get(opts, "driver");
if (driver && !strcmp(driver, "?")) { if (driver && !strcmp(driver, "?")) {
for (info = device_info_list; info != NULL; info = info->next) { for (info = device_info_list; info != NULL; info = info->next) {
if (info->no_user) {
continue; /* not available, don't show */
}
qdev_print_devinfo(info); qdev_print_devinfo(info);
} }
return 1; return 1;
@ -197,15 +200,10 @@ DeviceState *qdev_device_add(QemuOpts *opts)
/* find driver */ /* find driver */
info = qdev_find_info(NULL, driver); info = qdev_find_info(NULL, driver);
if (!info) { if (!info || info->no_user) {
qerror_report(QERR_DEVICE_NOT_FOUND, driver); qerror_report(QERR_DEVICE_NOT_FOUND, driver);
return NULL; return NULL;
} }
if (info->no_user) {
error_report("device \"%s\" can't be added via command line",
info->name);
return NULL;
}
/* find bus */ /* find bus */
path = qemu_opt_get(opts, "bus"); path = qemu_opt_get(opts, "bus");