From patchwork Wed Mar 25 15:15:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184813 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp736778ile; Wed, 25 Mar 2020 08:22:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vv7mwS2AhRSqkF457KsdtiZn17IOauT0Loys2/bTltqDuDpsU6zzsb72yxC4bBYIwae3Uek X-Received: by 2002:ac8:6b4b:: with SMTP id x11mr3557386qts.118.1585149766838; Wed, 25 Mar 2020 08:22:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149766; cv=none; d=google.com; s=arc-20160816; b=PSyQ1bzIzpArE6nDlGQKx62oiPlRXt37S1ztIPbGT/k3p3bi8s19Wjfw1KDdDQFaC+ YQcpjlkLujbV1W15xGNs0FJxGYc4+X3k2L65vwxKgRiqdSvBc9WqxfHxx+uq8Me958BZ qHLs+v1xY8AAazZVqdMnZFQ2KqZcL62Zt/cNmcRNArTJyo4CW+x05GOyIZ2w/pP3H6HA yIEwCy6/z3qnJ54j5N7FhK5G6Z++5wW5Qc0OHC8ofiNqH1XTKzvqRvhm3gwxxDhCJxc+ ocVsI2gFth7PtYFWi4n5I34iQ24MO2bxnl8htsthH/pTh9mqc4ydGLRKgKlzFEbg2pTx RQFQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=JFGkUPQkh4I5kvGc77pTwRXn7xAY7xDUmwIgt4hwlgXkdve2ZDfjbcmHlxo1/lD7ED OAASnbErmu+2tkM+Aw3Ryad500ml1KrdKJFtT5WNd8vr+8+3c23zdkvYBsaHtc4scKoD Ivfw0wM8sH51uufjc8tuuHvmg88hTB6Y+we9AkFtDrg86GS1jI00nsOtZkVmGA1BvFzM dLLE0SyKB7eEW4UYGHMz0DBpo+27kuXcmbkNOorIGdxCbxAv3Unz1oC+IyDdNyeOeBRO aOIH1EqknSR/mpBZMfxpXxxvuQyawPfcq6tF7OvO/9qIMlwkPhyc4DLC4LYcsu0jF/pM rifA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXdDAZXv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h3si12316673qkf.148.2020.03.25.08.22.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:22:46 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dXdDAZXv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7ri-00076p-D9 for patch@linaro.org; Wed, 25 Mar 2020 11:22:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41489) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7l5-0003dS-4a for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l3-00080i-So for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:55 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:34637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l3-000808-Lp for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:53 -0400 Received: by mail-wr1-x42c.google.com with SMTP id 65so3644739wrl.1 for ; Wed, 25 Mar 2020 08:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=dXdDAZXvntr0mdoAlmfxO6t0sZemPQDj8L03pHyEeVI7Evlqe+8fhLUdwL2u3Wot5T HoMJ3JUAcFsgHMwKycZiuBhVUCQTt4vTBb9kdJqIKiP3+IoymMDdFIDv2rXDVN3lgNd1 xXB90gxO3ebaLdGwQIbW2pGmjfvoxX/+fg0iO5Ce03tdRw0ER4V/wETsDff1GcVxCOAr wWmAPweSFQtLWsc9vNFCja9igeubXZOF0d+qaJiLnbVqkwusKZ6QN9lVQ0q4vyZfRI8e x2SrQdY5Apojkbe75e58j3eoc55Ybd9F70It3MQN4g+ouNwj6ex5xTrcAeHnhvvlRRpr 7njg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BVjll0Btf0ZgFKbd+CxXv9O+AQAJq5w3JoNQuRDkfgk=; b=M84WhnW7rIKYkfH0W3W1sfw5aKnFakUTq1l5hn84AdGfq6QfeR0/pT0zjcFusiFjhZ wK2UDY0IRTYlnCwTnsi0ORQoJwESx9BlfvRpIdx7Lq3w3V+/HheUrZqpjyAAzuILpOdC RO8PwTh0iwfmHhPqj1xugXv34K6NbKeypmhafiNmxUO6vFLvPjtanF8X9TphDIA3P5Wi U7UG7gIeouSwWteV186RT0zokEfUbre875vKdVI9NPLCS3zISlpRNlFuGR/yNcj1Mx19 XPjELTJTb9dJq1DMivY6fcOQJFBTZNZESB0SeiQ2Ia7LMNbwEU1eC9xqLX4byqn/kn0C UYGg== X-Gm-Message-State: ANhLgQ2YYe+9FVfncBh3vQAdxMDQHxR2UucOJseTxsNgGdYZTI52FoYF Fv3MNqGyGkCF5zVMEK/S5KiEHw== X-Received: by 2002:adf:d4ce:: with SMTP id w14mr4037020wrk.101.1585149352555; Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm36609784wro.25.2020.03.25.08.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 730561FF8C; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/11] tests/vm: move vga setup Date: Wed, 25 Mar 2020 15:15:34 +0000 Message-Id: <20200325151543.32478-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Gerd Hoffmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Move '-device VGA' from basevm.py to the guests, so they have the chance to opt out and run without display device. Signed-off-by: Gerd Hoffmann Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200310083218.26355-3-kraxel@redhat.com> Message-Id: <20200323161514.23952-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index c53fd354d95..cffe7c4600e 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -179,7 +179,6 @@ class BaseVM(object): def boot(self, img, extra_args=[]): args = self._args + [ - "-device", "VGA", "-drive", "file=%s,if=none,id=drive0,cache=writeback" % img, "-device", "virtio-blk,drive=drive0,bootindex=0"] args += self._data_args + extra_args diff --git a/tests/vm/fedora b/tests/vm/fedora index 4843b4175e0..bd9c6cf295c 100755 --- a/tests/vm/fedora +++ b/tests/vm/fedora @@ -82,6 +82,7 @@ class FedoraVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init(300) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 86770878b67..58166766d91 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -92,6 +92,7 @@ class FreeBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 55590f46015..f3257bc245a 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -86,6 +86,7 @@ class NetBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/openbsd b/tests/vm/openbsd index ab6abbedab5..0b705f49452 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -82,6 +82,7 @@ class OpenBSDVM(basevm.BaseVM): self.boot(img_tmp, extra_args = [ "-bios", "pc-bios/bios-256k.bin", "-machine", "graphics=off", + "-device", "VGA", "-cdrom", iso ]) self.console_init() diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386 index 3266038fbde..15707753353 100755 --- a/tests/vm/ubuntu.i386 +++ b/tests/vm/ubuntu.i386 @@ -36,7 +36,10 @@ class UbuntuX86VM(basevm.BaseVM): img_tmp = img + ".tmp" subprocess.check_call(["cp", "-f", cimg, img_tmp]) self.exec_qemu_img("resize", img_tmp, "50G") - self.boot(img_tmp, extra_args = ["-cdrom", self.gen_cloud_init_iso()]) + self.boot(img_tmp, extra_args = [ + "-device", "VGA", + "-cdrom", self.gen_cloud_init_iso() + ]) self.wait_ssh() self.ssh_root_check("touch /etc/cloud/cloud-init.disabled") self.ssh_root_check("apt-get update")