diff options
Diffstat (limited to 'hw/qdev.c')
| -rw-r--r-- | hw/qdev.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/hw/qdev.c b/hw/qdev.c index c64357603d..f47f0cb973 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -153,6 +153,24 @@ static int set_property(const char *name, const char *value, void *opaque) return 0; } +int qdev_device_help(QemuOpts *opts) +{ + const char *driver; + DeviceInfo *info; + char msg[256]; + + driver = qemu_opt_get(opts, "driver"); + if (driver && !strcmp(driver, "?")) { + for (info = device_info_list; info != NULL; info = info->next) { + qdev_print_devinfo(info, msg, sizeof(msg)); + qemu_error("%s\n", msg); + } + return 1; + } + + return 0; +} + DeviceState *qdev_device_add(QemuOpts *opts) { const char *driver, *path, *id; @@ -165,14 +183,6 @@ DeviceState *qdev_device_add(QemuOpts *opts) qemu_error("-device: no driver specified\n"); return NULL; } - if (strcmp(driver, "?") == 0) { - char msg[256]; - for (info = device_info_list; info != NULL; info = info->next) { - qdev_print_devinfo(info, msg, sizeof(msg)); - qemu_error("%s\n", msg); - } - return NULL; - } /* find driver */ info = qdev_find_info(NULL, driver); @@ -726,7 +736,7 @@ void do_device_add(Monitor *mon, const QDict *qdict) opts = qemu_opts_parse(&qemu_device_opts, qdict_get_str(qdict, "config"), "driver"); - if (opts) + if (opts && !qdev_device_help(opts)) qdev_device_add(opts); } |