Patchwork [RFC,47/48] monitor: Use argument type 'O' for device_add

login
register
mail settings
Submitter Markus Armbruster
Date Feb. 24, 2010, 5:55 p.m.
Message ID <1267034160-3517-48-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/46194/
State New
Headers show

Comments

Markus Armbruster - Feb. 24, 2010, 5:55 p.m.
While there, improve the params help text.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/qdev.c       |    3 +--
 qemu-monitor.hx |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/hw/qdev.c b/hw/qdev.c
index 80a027a..bcd989c 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 7f9d261..641a8ef 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,
     },