From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=45182 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OCHN9-00056b-Lx
	for qemu-devel@nongnu.org; Wed, 12 May 2010 15:13:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <weil@mail.berlios.de>) id 1OCHN5-0004GH-MY
	for qemu-devel@nongnu.org; Wed, 12 May 2010 15:13:35 -0400
Received: from moutng.kundenserver.de ([212.227.17.9]:50292)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <weil@mail.berlios.de>) id 1OCHN5-0004Fw-88
	for qemu-devel@nongnu.org; Wed, 12 May 2010 15:13:31 -0400
Message-ID: <4BEAFDCD.5070204@mail.berlios.de>
Date: Wed, 12 May 2010 21:13:17 +0200
From: Stefan Weil <weil@mail.berlios.de>
MIME-Version: 1.0
References: <1269952423-26043-1-git-send-email-armbru@redhat.com>
	<m3eihiaboo.fsf@blackfin.pond.sub.org>
In-Reply-To: <m3eihiaboo.fsf@blackfin.pond.sub.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH v2] Fix -device help and documentation
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-devel@nongnu.org

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>