From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30EE7C4740A for ; Mon, 9 Sep 2019 17:07:25 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B865921479 for ; Mon, 9 Sep 2019 17:07:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B865921479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7N8N-0003xG-JJ for qemu-devel@archiver.kernel.org; Mon, 09 Sep 2019 13:07:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7N7Y-0003Ox-4k for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:06:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7N7W-0004BT-PA for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:06:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i7N7W-0004B0-G5 for qemu-devel@nongnu.org; Mon, 09 Sep 2019 13:06:30 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3276EA70E for ; Mon, 9 Sep 2019 17:06:29 +0000 (UTC) Received: by mail-wr1-f71.google.com with SMTP id b1so7657737wru.4 for ; Mon, 09 Sep 2019 10:06:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=XSSdM9KT2oajzK5ijUyK3GTBXTtvAVX9VykuiUNjnD8=; b=JK1oNVccClPmRAqXC9H+QHX36JPJaRUZA4jbO7djPYqhp7CiPGCm87AGyt86LhVrMs 2pMvBf8iVvLzYQn2PDVKbK7wDtqPHv1XZipff2jZdpHU7iHKc/Z+D452PGDZsTrEgDlo FoA6gUj1n+Z3NVlwlzbpqSsc1oNmy7CvXQ0OK/EOQI+LTOc7VTU9DvIi22OQUbuD2ACb b59Eq/ge0m1MFKKXAQwZKbEab4zVWZYAIhMadHGX4hWLBuGKYmbXy7OzlnBXyE2inuBZ pQv9SA2TL/bNesO/5hrwHoe0p5/mvEAMx8lZt0entfrcKPL8hHPWiHwO5X+GB7hqGUr7 q6ww== X-Gm-Message-State: APjAAAWpX7PlY1kGDyM9jH0vb3WdQtVLFmqETuBTqxozl3icQgotH0GL bZ6j+1vz0LIBSR2ekuQyIaUJSR/OAyBl0NUzBh70eEdi7kkLsKRBmJMB65DDKdVOHZQ3oYQBgVp ph2WBcf00ue+Jlaw= X-Received: by 2002:adf:c504:: with SMTP id q4mr17275637wrf.266.1568048787828; Mon, 09 Sep 2019 10:06:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyd5naG1BHNZZo+P+bI/6rWNV4zPHl0AHllq9DqQoty/hBStMOL8MXnHMdKXnBHXY6oF5yDng== X-Received: by 2002:adf:c504:: with SMTP id q4mr17275613wrf.266.1568048787550; Mon, 09 Sep 2019 10:06:27 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:4580:a289:2f55:eec1? ([2001:b07:6468:f312:4580:a289:2f55:eec1]) by smtp.gmail.com with ESMTPSA id i9sm19149065wrb.18.2019.09.09.10.06.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 09 Sep 2019 10:06:27 -0700 (PDT) To: Thomas Huth , qemu-devel@nongnu.org References: <20190904052739.22123-1-thuth@redhat.com> From: Paolo Bonzini Openpgp: preference=signencrypt Message-ID: <5e8d67e5-842f-7cea-28a5-f07050615c38@redhat.com> Date: Mon, 9 Sep 2019 19:06:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190904052739.22123-1-thuth@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] Replace '-machine accel=xyz' with '-accel xyz' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 04/09/19 07:27, Thomas Huth wrote: > We've got a separate option to configure the accelerator nowadays, which > is shorter to type and the preferred way of specifying an accelerator. > Use it in the source and examples to show that it is the favored option. > (However, do not touch the places yet which also specify other machine > options or multiple accelerators - these are currently still better > handled with one single "-machine" statement instead) > > Signed-off-by: Thomas Huth > --- > python/qemu/qtest.py | 2 +- > qemu-deprecated.texi | 3 +-- > qemu-options.hx | 2 +- > tests/libqtest.c | 2 +- > tests/migration/guestperf/engine.py | 2 +- > tests/qemu-iotests/172 | 2 +- > 6 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py > index eebcc233ed..3f1d2cb325 100644 > --- a/python/qemu/qtest.py > +++ b/python/qemu/qtest.py > @@ -96,7 +96,7 @@ class QEMUQtestMachine(QEMUMachine): > def _base_args(self): > args = super(QEMUQtestMachine, self)._base_args() > args.extend(['-qtest', 'unix:path=' + self._qtest_path, > - '-machine', 'accel=qtest']) > + '-accel', 'qtest']) > return args > > def _pre_launch(self): > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi > index 00a4b6f350..0982e41698 100644 > --- a/qemu-deprecated.texi > +++ b/qemu-deprecated.texi > @@ -26,8 +26,7 @@ The @option{enforce-config-section} parameter is replaced by the > > @subsection -no-kvm (since 1.3.0) > > -The ``-no-kvm'' argument is now a synonym for setting > -``-machine accel=tcg''. > +The ``-no-kvm'' argument is now a synonym for setting ``-accel tcg''. > > @subsection -usbdevice (since 2.10.0) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 09e6439646..e0bba2abd1 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -4156,7 +4156,7 @@ STEXI > Enable FIPS 140-2 compliance mode. > ETEXI > > -HXCOMM Deprecated by -machine accel=tcg property > +HXCOMM Deprecated by -accel tcg > DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) > > DEF("msg", HAS_ARG, QEMU_OPTION_msg, > diff --git a/tests/libqtest.c b/tests/libqtest.c > index 2713b86cf7..67e39c59e7 100644 > --- a/tests/libqtest.c > +++ b/tests/libqtest.c > @@ -238,7 +238,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) > "-qtest-log %s " > "-chardev socket,path=%s,id=char0 " > "-mon chardev=char0,mode=control " > - "-machine accel=qtest " > + "-accel qtest " > "-display none " > "%s", qemu_binary, socket_path, > getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", > diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py > index f13dbea800..1dd04ce33b 100644 > --- a/tests/migration/guestperf/engine.py > +++ b/tests/migration/guestperf/engine.py > @@ -287,7 +287,7 @@ class Engine(object): > cmdline = "'" + cmdline + "'" > > argv = [ > - "-machine", "accel=kvm", > + "-accel", "kvm", > "-cpu", "host", > "-kernel", self._kernel, > "-initrd", self._initrd, > diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 > index ba7dad9057..d67997e5f6 100755 > --- a/tests/qemu-iotests/172 > +++ b/tests/qemu-iotests/172 > @@ -55,7 +55,7 @@ do_run_qemu() > done > fi > echo quit > - ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" > + ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@" > echo > } > > Acked-by: Paolo Bonzini Thanks. While "-accel kvm:tcg" is not going to be supported, the above replacement are all good. Paolo