aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-02-10 20:47:28 +0100
committerMarkus Armbruster <armbru@redhat.com>2010-03-16 17:45:35 +0100
commitc7e4e8ceb379e15c8cb79427f10169b2ccaa8de6 (patch)
treeeae221b1bf0426f66fb7751aec33deb5bd5bf652
parent361127dfb48d7d6b6b8e2e5fa79160d92e740a44 (diff)
monitor: Use argument type 'O' for device_add
While there, improve the params help text.
-rw-r--r--hw/qdev.c3
-rw-r--r--qemu-monitor.hx4
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/qdev.c b/hw/qdev.c
index 64cabd55a..a28e2623e 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -766,8 +766,7 @@ void do_device_add(Monitor *mon, const QDict *qdict)
{
QemuOpts *opts;
- opts = qemu_opts_parse(&qemu_device_opts,
- qdict_get_str(qdict, "config"), 1);
+ opts = qemu_opts_from_qdict(&qemu_device_opts, qdict);
if (opts) {
if (qdev_device_help(opts) || qdev_device_add(opts) == NULL) {
qemu_opts_del(opts);
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 7f9d261cd..45e5fd10f 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -570,8 +570,8 @@ ETEXI
{
.name = "device_add",
- .args_type = "config:s",
- .params = "device",
+ .args_type = "device:O",
+ .params = "driver[,prop=value][,...]",
.help = "add device, like -device on the command line",
.mhandler.cmd = do_device_add,
},