From c7e4e8ceb379e15c8cb79427f10169b2ccaa8de6 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 10 Feb 2010 20:47:28 +0100
Subject: [PATCH] monitor: Use argument type 'O' for device_add

While there, improve the params help text.
---
 hw/qdev.c       | 3 +--
 qemu-monitor.hx | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index 64cabd55a2..a28e2623e9 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 7f9d261cd9..45e5fd10f3 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,
     },