From nobody Wed Nov 5 13:02:31 2025 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=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534780627704164.4234077554264; Mon, 20 Aug 2018 08:57:07 -0700 (PDT) Received: from localhost ([::1]:47849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frmY5-0002Xn-Qx for importer@patchew.org; Mon, 20 Aug 2018 11:56:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52964) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frmXB-0001t3-Eo for qemu-devel@nongnu.org; Mon, 20 Aug 2018 11:56:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frmXA-0004lg-Jk for qemu-devel@nongnu.org; Mon, 20 Aug 2018 11:56:01 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:44742) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1frmXA-0004k7-Ct for qemu-devel@nongnu.org; Mon, 20 Aug 2018 11:56:00 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1frmX6-0003c3-Tz; Mon, 20 Aug 2018 16:55:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 16:55:54 +0100 Message-Id: <20180820155554.23476-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH] tests/vm: Use -cpu max rather than -cpu host 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: Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" -cpu max works with any accelerator, so we don't need to use it only conditionally if not using KVM. Just use it all the time. Signed-off-by: Peter Maydell --- This is equivalent to "revert dcf7ea4a78b105 and apply https://patchwork.ozlabs.org/patch/953122/". --- tests/vm/basevm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index d7149dea7da..13c06a35491 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -65,6 +65,7 @@ class BaseVM(object): self._stdout =3D self._devnull self._args =3D [ \ "-nodefaults", "-m", "4G", + "-cpu", "max", "-netdev", "user,id=3Dvnet,hostfwd=3D:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=3Dvnet", "-vnc", "127.0.0.1:0,to=3D20", @@ -72,11 +73,9 @@ class BaseVM(object): if vcpus: self._args +=3D ["-smp", str(vcpus)] if os.access("/dev/kvm", os.R_OK | os.W_OK): - self._args +=3D ["-cpu", "host"] self._args +=3D ["-enable-kvm"] else: logging.info("KVM not available, not using -enable-kvm") - self._args +=3D ["-cpu", "max"] self._data_args =3D [] =20 def _download_with_cache(self, url, sha256sum=3DNone): --=20 2.18.0