summaryrefslogtreecommitdiffstats
path: root/tests/vm/ubuntu.i386
diff options
context:
space:
mode:
authorGerd Hoffmann2020-03-23 17:15:05 +0100
committerAlex Bennée2020-03-27 14:43:20 +0100
commit50a06452c75424ad5f0a8d57997d7e16011160b3 (patch)
treea45c060cdf73aadbcfa67c50947c6f1dcf7b1899 /tests/vm/ubuntu.i386
parenttests/vm: write raw console log (diff)
downloadqemu-50a06452c75424ad5f0a8d57997d7e16011160b3.tar.gz
qemu-50a06452c75424ad5f0a8d57997d7e16011160b3.tar.xz
qemu-50a06452c75424ad5f0a8d57997d7e16011160b3.zip
tests/vm: move vga setup
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>
Diffstat (limited to 'tests/vm/ubuntu.i386')
-rwxr-xr-xtests/vm/ubuntu.i3865
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/vm/ubuntu.i386 b/tests/vm/ubuntu.i386
index 3266038fbd..1570775335 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")