From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1fSxyZ-0005Os-Ft for mharc-qemu-trivial@gnu.org; Wed, 13 Jun 2018 01:05:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSxyT-0005Kz-9Q for qemu-trivial@nongnu.org; Wed, 13 Jun 2018 01:05:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSxyR-0002Hz-Va for qemu-trivial@nongnu.org; Wed, 13 Jun 2018 01:05:37 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57128 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSxyO-0002D2-Jg; Wed, 13 Jun 2018 01:05:32 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2A6E087A80; Wed, 13 Jun 2018 05:05:32 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-24.ams2.redhat.com [10.36.116.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16579201CB71; Wed, 13 Jun 2018 05:05:29 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Stefan Hajnoczi , Eduardo Habkost , Ben Warren , zhang.zhanghailiang@huawei.com, Markus Armbruster , qemu-trivial@nongnu.org Date: Wed, 13 Jun 2018 07:05:20 +0200 Message-Id: <1528866321-23886-4-git-send-email-thuth@redhat.com> In-Reply-To: <1528866321-23886-1-git-send-email-thuth@redhat.com> References: <1528866321-23886-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 13 Jun 2018 05:05:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 13 Jun 2018 05:05:32 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-trivial] [PATCH 3/4] qemu-options: Improve the documentation of '-accel' and '-machine accel=...' X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2018 05:05:42 -0000 Instead of repeating the same text for both options, let's rather change the '-machine accel' documentation to point to the preferred '-accel' option instead. And in the documenation of the -accel option, make it clear that you can use colons to specify multiple accelerators. Signed-off-by: Thomas Huth --- qemu-options.hx | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 451f7a6..0ec9cac 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -30,8 +30,7 @@ ETEXI DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n" - " property accel=accel1[:accel2[:...]] selects accelerator\n" - " supported accelerators are kvm, xen, hax, hvf, whpx or tcg (default: tcg)\n" + " property accel=accel1[:accel2[:...]] selects accelerator (see -accel)\n" " kernel_irqchip=on|off|split controls accelerated irqchip support (default=off)\n" " vmport=on|off|auto controls emulation of vmport (default: auto)\n" " kvm_shadow_mem=size of KVM shadow MMU in bytes\n" @@ -66,10 +65,8 @@ of QEMU will support machine types from many previous versions. Supported machine properties are: @table @option @item accel=@var{accels1}[:@var{accels2}[:...]] -This is used to enable an accelerator. Depending on the target architecture, -kvm, xen, hax, hvf, whpx or tcg can be available. By default, tcg is used. If there is -more than one accelerator specified, the next one is used if the previous one -fails to initialize. +This can be used to enable an accelerator. See the preferred @code{-accel} +option for a list of available accelerators. @item kernel_irqchip=on|off Controls in-kernel irqchip support for the chosen accelerator when available. @item gfx_passthru=on|off @@ -128,16 +125,17 @@ Select CPU model (@code{-cpu help} for list and additional feature selection) ETEXI DEF("accel", HAS_ARG, QEMU_OPTION_accel, - "-accel [accel=]accelerator[,thread=single|multi]\n" + "-accel [accel=]accelerator[:accelerator[:...]][,thread=single|multi]\n" " select accelerator (kvm, xen, hax, hvf, whpx or tcg; use 'help' for a list)\n" - " thread=single|multi (enable multi-threaded TCG)", QEMU_ARCH_ALL) + " thread=single|multi (enable multi-threaded TCG)\n", QEMU_ARCH_ALL) STEXI @item -accel @var{name}[,prop=@var{value}[,...]] @findex -accel This is used to enable an accelerator. Depending on the target architecture, -kvm, xen, hax, hvf, whpx or tcg can be available. By default, tcg is used. If there is -more than one accelerator specified, the next one is used if the previous one -fails to initialize. +kvm, xen, hax, hvf, whpx or tcg can be available. By default, tcg is used. +Multiple accelerators can be specified by separating them with a colon. If +there is more than one accelerator specified, the next one is used if the +previous one fails to initialize. @table @option @item thread=single|multi Controls number of TCG threads. When the TCG is multi-threaded there will be one -- 1.8.3.1