From patchwork Fri Jan 29 18:49:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 44010 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 BFB90B7D1E for ; Sat, 30 Jan 2010 06:08:38 +1100 (EST) Received: from localhost ([127.0.0.1]:57849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Naw4t-00007p-Fi for incoming@patchwork.ozlabs.org; Fri, 29 Jan 2010 14:00:23 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Navu7-0005hg-9B for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Navu1-0005bz-0a for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:13 -0500 Received: from [199.232.76.173] (port=37791 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Navu0-0005bf-9g for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:08 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:53376) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Navtz-0008A3-KE for qemu-devel@nongnu.org; Fri, 29 Jan 2010 13:49:07 -0500 Received: from blackfin.pond.sub.org (pD9E39E9E.dip.t-dialin.net [217.227.158.158]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 3051C2DD311; Fri, 29 Jan 2010 19:49:04 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id B9D27429; Fri, 29 Jan 2010 19:49:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 29 Jan 2010 19:49:01 +0100 Message-Id: <1264790942-15045-7-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1264790942-15045-1-git-send-email-armbru@redhat.com> References: <1264790942-15045-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Subject: [Qemu-devel] [PATCH 6/7] qdev: update help on -device 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 While there, use "property" rather than "option", for consistency with -global. Signed-off-by: Markus Armbruster --- qemu-options.hx | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 5c9f482..4c1bcfb 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -403,20 +403,17 @@ Network adapter that supports CDC ethernet and RNDIS protocols. ETEXI DEF("device", HAS_ARG, QEMU_OPTION_device, - "-device driver[,option[=value][,...]]\n" - " add device (based on driver) with default or\n" - " user defined options\n" + "-device driver[,prop[=value][,...]]\n" + " 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") -STEXI -@item -device @var{driver}[,@var{option}[=@var{value}][,...]] -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}=?}. + " use -device driver,? to print all possible properties\n") +STEXI +@item -device @var{driver}[,@var{prop}[=@var{value}][,...]] +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,