Re: [PATCH v1 02/11] tests/vm: move vga setup

[Philippe Mathieu-Daudé]

On 3/23/20 5:15 PM, Alex Bennée wrote:
> 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>
> Message-Id: <address@hidden>

Already reviewed:
https://www.mail-archive.com/address@hidden/msg686829.html
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   tests/vm/basevm.py   | 1 -
>   tests/vm/fedora      | 1 +
>   tests/vm/freebsd     | 1 +
>   tests/vm/netbsd      | 1 +
>   tests/vm/openbsd     | 1 +
>   tests/vm/ubuntu.i386 | 5 ++++-
>   6 files changed, 8 insertions(+), 2 deletions(-)
>
> 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")