summary refs log tree commit diff stats
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-05-11 14:02:31 +0200
committerBlue Swirl <blauwirbel@gmail.com>2010-05-22 08:37:48 +0000
commit9848bbf1a8b69cc6a8497b075ce5d171f7c62f1a (patch)
treea3b358c958371fcc616a510d7494c829d04ef4e3 /qemu-options.hx
parent4c0a6db01b89ff314b964ff7a9ae51276f127a34 (diff)
downloadfocaccia-qemu-9848bbf1a8b69cc6a8497b075ce5d171f7c62f1a.tar.gz
focaccia-qemu-9848bbf1a8b69cc6a8497b075ce5d171f7c62f1a.zip
Fix -device help and documentation
Commit 6616b2ad reverted commit 40ea285c.  Looks like a mismerge to
me.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r--qemu-options.hx15
1 files changed, 6 insertions, 9 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 12f6b5179d..03e95fd2bf 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -464,18 +464,15 @@ DEF("device", HAS_ARG, QEMU_OPTION_device,
     "                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",
+    "                use -device driver,? to print all possible properties\n",
     QEMU_ARCH_ALL)
 STEXI
-@item -device @var{driver}[,@var{option}[=@var{value}][,...]]
+@item -device @var{driver}[,@var{prop}[=@var{value}][,...]]
 @findex -device
-Add device @var{driver}. Depending on the device type,
-@var{option} (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
-@code{-device ?},
-@code{-device @var{driver},?} or
-@code{-device @var{driver},@var{option}=?}. 
+Add device @var{driver}.  @var{prop}=@var{value} sets driver
+properties.  Valid properties depend on the driver.  To get help on
+possible drivers and properties, use @code{-device ?} and
+@code{-device @var{driver},?}.
 ETEXI
 
 #ifdef CONFIG_LINUX