From patchwork Wed Sep 26 02:55:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 147527 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp181063lji; Tue, 25 Sep 2018 20:00:17 -0700 (PDT) X-Google-Smtp-Source: ACcGV62wjKh9Sc5VuYryJTS8/viBAck8sSrxd3Aora3/J58eQx5U3k0fz4CnjrBapPAqlc4r0LRj X-Received: by 2002:a37:71c1:: with SMTP id m184-v6mr2792890qkc.5.1537930817756; Tue, 25 Sep 2018 20:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537930817; cv=none; d=google.com; s=arc-20160816; b=lplZvI8nKG2s5j4a3098K9Z9CWk72i+mRWweVbo9sHUZsAI/oiFLCVdmykLUfIcNSo 9fpOWroQ9pJr6ywAoFVmXeKu/k1siTzylDdZw9vM0WZtu/og2qGvGdOmczR6RCYPYfug M0zOVdcsGSA7Ko71KELR34zPwjIsHTm+Kv2hCRFoCO5sG+tNFkolPZ8X/1sI7/Uz0Euj 5X/26OHKzQlhc07y1KgAq0H82GlY3zQ3U5/rjcqxRZq9UDSrEbHZ1dNBqIN2nHKmQ05U jTpUqb/DAYfM8fHXb25cfkrheMFaBDylhf/PhNN4vFacUgd+opCbwoE1ZrPpTp28NQ0z AgQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from; bh=rZ/II9IwFU/qlZoBoUMshzCjEKWysznR5XjrrNAfyyo=; b=WPYWQV97wliiBOdZfM+md6U8UCOuq1e6hu7RECwLY4w1o6ORvanebXFLzzSGb8qwXe okUQe52ITxQ3Tf6AOz1rbG7fBDtiR1xpw3zvGZoaUS16B4+Jjq7TGyNP8X4JIlTelVtG jgkQMvR/a8QNxr3wr+VZZqCz7sowGlINOYnIRW/i5NatbpbvBnbugNqmFqdh6X6UvdkY Z9Ki0ZCkbPrmaWyq3rVia25CLyv5F1mIaRtlLWFs4KGRQfvkZUTgbqeFwAdMOaEC/wJ3 +kP/7hHFWnMwEA6B17/tUeEock4kZBBZalE5qGg9NWVjm8VosbYbq63/4xMQftLHxhOX Hepw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x36-v6si1802068qtd.243.2018.09.25.20.00.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Sep 2018 20:00:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:56149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g503l-0005ta-AJ for patch@linaro.org; Tue, 25 Sep 2018 23:00:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4zzM-0002CF-7g for qemu-devel@nongnu.org; Tue, 25 Sep 2018 22:55:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4zzK-0002nH-He for qemu-devel@nongnu.org; Tue, 25 Sep 2018 22:55:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45714) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g4zzI-0002jI-Ps for qemu-devel@nongnu.org; Tue, 25 Sep 2018 22:55:42 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0604340F26; Wed, 26 Sep 2018 02:55:40 +0000 (UTC) Received: from lemon.usersys.redhat.com (ovpn-12-196.pek2.redhat.com [10.72.12.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE28C308BE75; Wed, 26 Sep 2018 02:55:38 +0000 (UTC) From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2018 10:55:25 +0800 Message-Id: <20180926025526.26961-5-famz@redhat.com> In-Reply-To: <20180926025526.26961-1-famz@redhat.com> References: <20180926025526.26961-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 26 Sep 2018 02:55:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/5] 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: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell -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 Message-Id: <20180820155554.23476-1-peter.maydell@linaro.org> Signed-off-by: Fam Zheng --- tests/vm/basevm.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.17.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 7e58d9e0ca..cafbc6b3a5 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -65,6 +65,7 @@ class BaseVM(object): self._stdout = self._devnull self._args = [ \ "-nodefaults", "-m", "4G", + "-cpu", "max", "-netdev", "user,id=vnet,hostfwd=:127.0.0.1:0-:22", "-device", "virtio-net-pci,netdev=vnet", "-vnc", "127.0.0.1:0,to=20", @@ -72,11 +73,9 @@ class BaseVM(object): if vcpus: self._args += ["-smp", str(vcpus)] if os.access("/dev/kvm", os.R_OK | os.W_OK): - self._args += ["-cpu", "host"] self._args += ["-enable-kvm"] else: logging.info("KVM not available, not using -enable-kvm") - self._args += ["-cpu", "max"] self._data_args = [] def _download_with_cache(self, url, sha256sum=None):