* [Qemu-devel] [PATCH] Fix -device help and documentation
@ 2010-03-30 12:33 Markus Armbruster
2010-05-11 12:02 ` [Qemu-devel] [PATCH v2] " Markus Armbruster
0 siblings, 1 reply; 4+ messages in thread
From: Markus Armbruster @ 2010-03-30 12:33 UTC (permalink / raw)
To: qemu-devel
Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to
me.
Signed-off-by: Markus Armbruster <armbru@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{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
DEF("name", HAS_ARG, QEMU_OPTION_name,
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PATCH v2] Fix -device help and documentation
2010-03-30 12:33 [Qemu-devel] [PATCH] Fix -device help and documentation Markus Armbruster
@ 2010-05-11 12:02 ` Markus Armbruster
2010-05-12 19:13 ` [Qemu-devel] " Stefan Weil
2010-05-22 9:29 ` [Qemu-devel] " Blue Swirl
0 siblings, 2 replies; 4+ messages in thread
From: Markus Armbruster @ 2010-05-11 12:02 UTC (permalink / raw)
To: qemu-devel
Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to
me.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
v2: rebased (v1 fell through the cracks apparently)
qemu-options.hx | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 12f6b51..03e95fd 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
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] Re: [PATCH v2] Fix -device help and documentation
2010-05-11 12:02 ` [Qemu-devel] [PATCH v2] " Markus Armbruster
@ 2010-05-12 19:13 ` Stefan Weil
2010-05-22 9:29 ` [Qemu-devel] " Blue Swirl
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Weil @ 2010-05-12 19:13 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
Am 11.05.2010 14:02, schrieb Markus Armbruster:
> Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to
> me.
>
> Signed-off-by: Markus Armbruster<armbru@redhat.com>
> ---
> v2: rebased (v1 fell through the cracks apparently)
>
> qemu-options.hx | 15 ++++++---------
> 1 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 12f6b51..03e95fd 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
>
Acked-by: Stefan Weil <weil@mail.berlios.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] Fix -device help and documentation
2010-05-11 12:02 ` [Qemu-devel] [PATCH v2] " Markus Armbruster
2010-05-12 19:13 ` [Qemu-devel] " Stefan Weil
@ 2010-05-22 9:29 ` Blue Swirl
1 sibling, 0 replies; 4+ messages in thread
From: Blue Swirl @ 2010-05-22 9:29 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
Thanks, applied.
On Tue, May 11, 2010 at 12:02 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to
> me.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> v2: rebased (v1 fell through the cracks apparently)
>
> qemu-options.hx | 15 ++++++---------
> 1 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 12f6b51..03e95fd 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
> --
> 1.6.6.1
>
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-22 9:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-30 12:33 [Qemu-devel] [PATCH] Fix -device help and documentation Markus Armbruster
2010-05-11 12:02 ` [Qemu-devel] [PATCH v2] " Markus Armbruster
2010-05-12 19:13 ` [Qemu-devel] " Stefan Weil
2010-05-22 9:29 ` [Qemu-devel] " Blue Swirl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).