From patchwork Tue May 11 12:02:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 52285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9AB73B7D7A for ; Tue, 11 May 2010 22:03:14 +1000 (EST) Received: from localhost ([127.0.0.1]:33194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBoB5-0005lz-Mj for incoming@patchwork.ozlabs.org; Tue, 11 May 2010 08:03:11 -0400 Received: from [140.186.70.92] (port=35569 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OBoAY-0005lX-UG for qemu-devel@nongnu.org; Tue, 11 May 2010 08:02:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OBoAX-0006J0-3L for qemu-devel@nongnu.org; Tue, 11 May 2010 08:02:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42777) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OBoAW-0006Ir-Oo for qemu-devel@nongnu.org; Tue, 11 May 2010 08:02:37 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4BC2XF3009796 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 11 May 2010 08:02:34 -0400 Received: from blackfin.pond.sub.org (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4BC2WSW032482; Tue, 11 May 2010 08:02:33 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 6517C55; Tue, 11 May 2010 14:02:31 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org References: <1269952423-26043-1-git-send-email-armbru@redhat.com> Date: Tue, 11 May 2010 14:02:31 +0200 In-Reply-To: <1269952423-26043-1-git-send-email-armbru@redhat.com> (Markus Armbruster's message of "Tue, 30 Mar 2010 14:33:43 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH v2] Fix -device help and documentation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Commit 6616b2ad reverted commit 40ea285c. Looks like a mismerge to me. Signed-off-by: Markus Armbruster Acked-by: Stefan Weil --- 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