Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to
me.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
qemu-options.hx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index e2a5ca6..692809d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -456,17 +456,14 @@ 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")
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{pro...@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
DEF("name", HAS_ARG, QEMU_OPTION_name,
--
1.6.6.1
