From patchwork Tue Mar 30 12:33:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 48954 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 DCB01B7C8E for ; Tue, 30 Mar 2010 23:37:54 +1100 (EST) Received: from localhost ([127.0.0.1]:57594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwaha-0003Df-2m for incoming@patchwork.ozlabs.org; Tue, 30 Mar 2010 08:37:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nwadi-0002Hy-6R for qemu-devel@nongnu.org; Tue, 30 Mar 2010 08:33:50 -0400 Received: from [140.186.70.92] (port=34827 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwadg-0002H5-Kd for qemu-devel@nongnu.org; Tue, 30 Mar 2010 08:33:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nwadf-0000Cv-Ay for qemu-devel@nongnu.org; Tue, 30 Mar 2010 08:33:48 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:37299) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nwade-0000Cd-PY for qemu-devel@nongnu.org; Tue, 30 Mar 2010 08:33:47 -0400 Received: from blackfin.pond.sub.org (pD951AC30.dip.t-dialin.net [217.81.172.48]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 1589F2DD326; Tue, 30 Mar 2010 14:33:44 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 1DC4270; Tue, 30 Mar 2010 14:33:43 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 30 Mar 2010 14:33:43 +0200 Message-Id: <1269952423-26043-1-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Subject: [Qemu-devel] [PATCH] 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 --- 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,