From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PULL v2 03/12] tests/vm: move vga setup
Date: Fri, 27 Mar 2020 18:13:11 +0000 [thread overview]
Message-ID: <20200327181320.23329-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org>
From: Gerd Hoffmann <kraxel@redhat.com>
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 <kraxel@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200310083218.26355-3-kraxel@redhat.com>
Message-Id: <20200323161514.23952-3-alex.bennee@linaro.org>
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")
--
2.20.1
next prev parent reply other threads:[~2020-03-27 18:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-27 18:13 [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change) Alex Bennée
2020-03-27 18:13 ` [PULL v2 01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h Alex Bennée
2020-03-27 18:13 ` [PULL v2 02/12] tests/vm: write raw console log Alex Bennée
2020-03-27 18:13 ` Alex Bennée [this message]
2020-03-27 18:13 ` [PULL v2 04/12] tests/vm: update FreeBSD to 12.1 Alex Bennée
2020-03-27 18:13 ` [PULL v2 05/12] tests/vm: update NetBSD to 9.0 Alex Bennée
2020-03-27 18:13 ` [PULL v2 06/12] tests/vm: fix basevm config Alex Bennée
2020-03-27 18:13 ` [PULL v2 07/12] configure: disable MTTCG for MIPS guests Alex Bennée
2020-03-27 18:13 ` [PULL v2 08/12] tests/docker: Keep package list sorted Alex Bennée
2020-03-27 18:13 ` [PULL v2 09/12] tests/docker: Install gcrypt devel package in Debian image Alex Bennée
2020-03-27 18:13 ` [PULL v2 10/12] tests/docker: Use Python3 PyYAML in the Fedora image Alex Bennée
2020-03-27 18:13 ` [PULL v2 11/12] tests/docker: Add libepoxy and libudev packages to " Alex Bennée
2020-03-27 18:13 ` [PULL v2 12/12] .travis.yml: Add a KVM-only s390x job Alex Bennée
2020-03-27 19:18 ` [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200327181320.23329-4-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).