[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/11] tests/vm: move vga setup
From: |
Alex Bennée |
Subject: |
[PULL 02/11] tests/vm: move vga setup |
Date: |
Wed, 25 Mar 2020 15:15:34 +0000 |
From: Gerd Hoffmann <address@hidden>
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 <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>
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
- [PULL for 5.0-rc1 00/11] testing updates (+ one mttcg change), Alex Bennée, 2020/03/25
- [PULL 03/11] tests/vm: update FreeBSD to 12.1, Alex Bennée, 2020/03/25
- [PULL 01/11] tests/vm: write raw console log, Alex Bennée, 2020/03/25
- [PULL 04/11] tests/vm: update NetBSD to 9.0, Alex Bennée, 2020/03/25
- [PULL 02/11] tests/vm: move vga setup,
Alex Bennée <=
- [PULL 05/11] tests/vm: fix basevm config, Alex Bennée, 2020/03/25
- [PULL 08/11] tests/docker: Install gcrypt devel package in Debian image, Alex Bennée, 2020/03/25
- [PULL 06/11] configure: disable MTTCG for MIPS guests, Alex Bennée, 2020/03/25
- [PULL 10/11] tests/docker: Add libepoxy and libudev packages to the Fedora image, Alex Bennée, 2020/03/25
- [PULL 09/11] tests/docker: Use Python3 PyYAML in the Fedora image, Alex Bennée, 2020/03/25
- [PULL 07/11] tests/docker: Keep package list sorted, Alex Bennée, 2020/03/25
- [PULL 11/11] .travis.yml: Add a KVM-only s390x job, Alex Bennée, 2020/03/25
- Re: [PULL for 5.0-rc1 00/11] testing updates (+ one mttcg change), Peter Maydell, 2020/03/26