From nobody Thu Apr 25 01:00:34 2024 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493718793092166.57932085481718; Tue, 2 May 2017 02:53:13 -0700 (PDT) Received: from localhost ([::1]:57747 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5UUZ-00048e-Pk for importer@patchew.org; Tue, 02 May 2017 05:53:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5UTa-0003ZP-TF for qemu-devel@nongnu.org; Tue, 02 May 2017 05:52:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5UTX-0007IX-RC for qemu-devel@nongnu.org; Tue, 02 May 2017 05:52:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5UTX-0007GN-Hm for qemu-devel@nongnu.org; Tue, 02 May 2017 05:52:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4380AE23EA; Tue, 2 May 2017 09:52:06 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id 033B878C0D; Tue, 2 May 2017 09:52:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 4380AE23EA Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 4380AE23EA From: Thomas Huth To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 11:52:01 +0200 Message-Id: <1493718721-29774-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 02 May 2017 09:52:06 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] Fix the -accel parameter and the documentation for 'hax' 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: Paolo Bonzini , Vincent Palatin 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" Since 'hax' is a possible accelerator nowadays, too, the '-accel' option should support it and we should mention it in the documentation, too. Signed-off-by: Thomas Huth --- qemu-options.hx | 8 ++++---- vl.c | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 787b9c3..c7b1d2d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -31,7 +31,7 @@ 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, tcg (default: tc= g)\n" + " supported accelerators are kvm, xen, hax or tcg (defa= ult: tcg)\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" @@ -52,9 +52,9 @@ available machines. 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, or tcg can be available. By default, tcg is used. If there is mo= re -than one accelerator specified, the next one is used if the previous one f= ails -to initialize. +kvm, xen, hax 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. @item kernel_irqchip=3Don|off Controls in-kernel irqchip support for the chosen accelerator when availab= le. @item gfx_passthru=3Don|off diff --git a/vl.c b/vl.c index f46e070..d5e88fb 100644 --- a/vl.c +++ b/vl.c @@ -3725,26 +3725,22 @@ int main(int argc, char **argv, char **envp) qdev_prop_register_global(&kvm_pit_lost_tick_policy); break; } - case QEMU_OPTION_accel: + case QEMU_OPTION_accel: { + char *mstr; + accel_opts =3D qemu_opts_parse_noisily(qemu_find_opts("acc= el"), optarg, true); optarg =3D qemu_opt_get(accel_opts, "accel"); - - olist =3D qemu_find_opts("machine"); - if (strcmp("kvm", optarg) =3D=3D 0) { - qemu_opts_parse_noisily(olist, "accel=3Dkvm", false); - } else if (strcmp("xen", optarg) =3D=3D 0) { - qemu_opts_parse_noisily(olist, "accel=3Dxen", false); - } else if (strcmp("tcg", optarg) =3D=3D 0) { - qemu_opts_parse_noisily(olist, "accel=3Dtcg", false); - } else { - if (!is_help_option(optarg)) { - error_printf("Unknown accelerator: %s", optarg); - } - error_printf("Supported accelerators: kvm, xen, tcg\n"= ); + if (is_help_option(optarg)) { + error_printf("Possible accelerators: kvm, xen, hax, tc= g\n"); exit(1); } + mstr =3D g_strdup_printf("accel=3D%s", optarg); + olist =3D qemu_find_opts("machine"); + qemu_opts_parse_noisily(olist, mstr, false); + g_free(mstr); break; + } case QEMU_OPTION_usb: olist =3D qemu_find_opts("machine"); qemu_opts_parse_noisily(olist, "usb=3Don", false); --=20 1.8.3.1