From nobody Tue Feb 10 05:17:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528866626134403.70581044113464; Tue, 12 Jun 2018 22:10:26 -0700 (PDT) Received: from localhost ([::1]:60002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSy37-00008i-DP for importer@patchew.org; Wed, 13 Jun 2018 01:10:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSxyQ-0005Ih-FK for qemu-devel@nongnu.org; Wed, 13 Jun 2018 01:05:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSxyP-0002DD-19 for qemu-devel@nongnu.org; Wed, 13 Jun 2018 01:05:34 -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 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-devel] [PATCH 3/4] qemu-options: Improve the documentation of '-accel' and '-machine accel=...' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Ben Warren , qemu-trivial@nongnu.org, Markus Armbruster , Stefan Hajnoczi , zhang.zhanghailiang@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Stefan Hajnoczi --- 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=3D]name[,prop[=3Dvalue][,...]]\n" " selects emulated machine ('-machine help' for list)\n" - " property accel=3Daccel1[:accel2[:...]] selects accele= rator\n" - " supported accelerators are kvm, xen, hax, hvf, whpx o= r tcg (default: tcg)\n" + " property accel=3Daccel1[:accel2[:...]] selects accele= rator (see -accel)\n" " kernel_irqchip=3Don|off|split controls accelerated ir= qchip support (default=3Doff)\n" " vmport=3Don|off|auto controls emulation of vmport (de= fault: auto)\n" " kvm_shadow_mem=3Dsize of KVM shadow MMU in bytes\n" @@ -66,10 +65,8 @@ of QEMU will support machine types from many previous ve= rsions. Supported machine properties are: @table @option @item accel=3D@var{accels1}[:@var{accels2}[:...]] -This is used to enable an accelerator. Depending on the target architectur= e, -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=3Don|off Controls in-kernel irqchip support for the chosen accelerator when availab= le. @item gfx_passthru=3Don|off @@ -128,16 +125,17 @@ Select CPU model (@code{-cpu help} for list and addit= ional feature selection) ETEXI =20 DEF("accel", HAS_ARG, QEMU_OPTION_accel, - "-accel [accel=3D]accelerator[,thread=3Dsingle|multi]\n" + "-accel [accel=3D]accelerator[:accelerator[:...]][,thread=3Dsingle|mul= ti]\n" " select accelerator (kvm, xen, hax, hvf, whpx or tcg; = use 'help' for a list)\n" - " thread=3Dsingle|multi (enable multi-threaded TCG)", Q= EMU_ARCH_ALL) + " thread=3Dsingle|multi (enable multi-threaded TCG)\n",= QEMU_ARCH_ALL) STEXI @item -accel @var{name}[,prop=3D@var{value}[,...]] @findex -accel This is used to enable an accelerator. Depending on the target architectur= e, -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=3Dsingle|multi Controls number of TCG threads. When the TCG is multi-threaded there will = be one --=20 1.8.3.1