[Qemu-devel] [PATCH 6/7] qdev: update help on -device

[Markus Armbruster]

While there, use "property" rather than "option", for consistency with
-global.

Signed-off-by: Markus Armbruster <address@hidden>
---
 qemu-options.hx |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 5c9f482..4c1bcfb 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -403,20 +403,17 @@ Network adapter that supports CDC ethernet and RNDIS 
protocols.
 ETEXI
 
 DEF("device", HAS_ARG, QEMU_OPTION_device,
-    "-device driver[,option[=value][,...]]\n"
-    "                add device (based on driver) with default or\n"
-    "                user defined options\n"
+    "-device driver[,prop[=value][,...]]\n"
+    "                add device (based on driver)\n"
+    "                prop=value,... sets driver properties\n"
     "                use -device ? to print all possible drivers\n"
-    "                use -device driver,? to print all possible options\n"
-    "                use -device driver,option=? to print a help for value\n")
-STEXI
address@hidden -device @var{driver}[,@address@hidden,...]]
-Add device @var{driver}. Depending on the device type,
address@hidden (with default or given @var{value}) may be useful.
-To get a help on possible @var{driver}s, @var{option}s or @var{value}s, use
address@hidden ?},
address@hidden @var{driver},?} or
address@hidden @var{driver},@var{option}=?}. 
+    "                use -device driver,? to print all possible properties\n")
+STEXI
address@hidden -device @var{driver}[,@address@hidden,...]]
+Add device @var{driver}.  @address@hidden sets driver
+properties.  Valid properties depend on the driver.  To get help on
+possible drivers and properties, use @code{-device ?} and
address@hidden @var{driver},?}.
 ETEXI
 
 DEF("name", HAS_ARG, QEMU_OPTION_name,
-- 
1.6.6