From: Cole Robinson <crobinso@redhat.com>
Date: Sun, 27 Aug 2017 15:04:41 +0000 (-0400)
Subject: qemu: Set default video type in qemu PostParse
X-Git-Tag: v3.8.0-rc1~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef08a545388f388b7c76b99a3f3d2584daf05145;p=thirdparty%2Flibvirt.git

qemu: Set default video type in qemu PostParse

And not generic domain_conf code. We will need qemu private functions
in a bit.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 781104d576..6cffe2c953 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13939,9 +13939,6 @@ virDomainVideoDefaultType(const virDomainDef *def)
 {
     switch (def->virtType) {
     case VIR_DOMAIN_VIRT_TEST:
-    case VIR_DOMAIN_VIRT_QEMU:
-    case VIR_DOMAIN_VIRT_KQEMU:
-    case VIR_DOMAIN_VIRT_KVM:
     case VIR_DOMAIN_VIRT_XEN:
         if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type == VIR_DOMAIN_OSTYPE_LINUX)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6336d3e943..fe6b72ff59 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3781,6 +3781,13 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     }
 
     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
+        if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
+            if ARCH_IS_PPC64(def->os.arch)
+                dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VGA;
+            else
+                dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+        }
+
         if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
             !dev->data.video->vgamem) {
             dev->data.video->vgamem = QEMU_QXL_VGAMEM_DEFAULT;