From 4860ad1398c6345ded56758bd6f08d10eaa7ed00 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 9 Nov 2021 15:52:11 -0800
Subject: [PATCH] Revert "Stop using virtio video temporarily (#2020438)"

This reverts commit 9dbd614fe4e83acbbda759a900ff8fec29beeb5c
(and a follow-up commit). The bug has been fixed in the latest
Rawhide kernel, so we can go back to virtio.
---
 templates.fif.json | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/templates.fif.json b/templates.fif.json
index d13d0900..765d48b8 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -8,7 +8,7 @@
                 "QEMUCPU": "Nehalem",
                 "QEMUCPUS": "2",
                 "QEMURAM": "2048",
-                "QEMUVGA": "qxl",
+                "QEMUVGA": "virtio",
                 "QEMU_VIRTIO_RNG": "1",
                 "WORKER_CLASS": "qemu_x86_64"
             }
@@ -38,7 +38,6 @@
                 "QEMUCPUS": "2",
                 "QEMUMACHINE": "virt,gic-version=max",
                 "QEMURAM": 3072,
-                "QEMU_OVERRIDE_VIDEO_DEVICE_AARCH64": 1,
                 "QEMU_VIRTIO_RNG": "1",
                 "SERIALDEV": "ttyAMA0",
                 "TIMEOUT_SCALE": "1.5",
@@ -57,7 +56,7 @@
                 "QEMU": "ppc64",
                 "QEMUCPU": "host",
                 "QEMURAM": 4096,
-                "QEMUVGA": "std",
+                "QEMUVGA": "virtio",
                 "QEMU_VIRTIO_RNG": "1",
                 "WORKER_CLASS": "qemu_ppc64le"
             }
@@ -70,7 +69,7 @@
                 "QEMUCPU": "Nehalem",
                 "QEMUCPUS": "2",
                 "QEMURAM": "2048",
-                "QEMUVGA": "qxl",
+                "QEMUVGA": "virtio",
                 "QEMU_VIRTIO_RNG": "1",
                 "UEFI": "1",
                 "UEFI_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
@@ -2161,7 +2160,6 @@
                 "+START_AFTER_TEST": "server_cockpit_default",
                 "BOOTFROM": "c",
                 "POSTINSTALL": "server_cockpit_updates server_cockpit_autoupdate",
-                "QEMUVGA": "virtio",
                 "ROOT_PASSWORD": "weakpassword",
                 "USER_LOGIN": "false"
             }