qemu: the actual change of default video devide type selection algorithm

If a graphics device was added to XML that had no video device, libvirt
automatically added a video device which was always of type 'cirrus' on
x86_64, even if the underlying qemu didn't support cirrus.

This patch refines a bit the decision about the type of the video device.
Based on QEMU capabilities, cirrus is still preferred but only added if
QEMU supports it, otherwise VGA is used if supported by QEMU.  There is now
no fallback as libvirt only aspires to generate a basic working config and
leaves anything more specific up to higher-level management tools.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Pavel Mores <pmores@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4a6975e285e86ce69bec22ee4b37a0215bccdd79..d14f0dabf36c1eee5edbca2f66908a03c9b7fa2d 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7881,25 +7881,32 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
 
 
 static int
-qemuDomainDefaultVideoDevice(const virDomainDef *def)
+qemuDomainDefaultVideoDevice(const virDomainDef *def,
+                          virQEMUCapsPtr qemuCaps)
 {
-    if (ARCH_IS_PPC64(def->os.arch))
+    if (ARCH_IS_PPC64(def->os.arch)) {
         return VIR_DOMAIN_VIDEO_TYPE_VGA;
-    else if (qemuDomainIsARMVirt(def) ||
-             qemuDomainIsRISCVVirt(def) ||
-             ARCH_IS_S390(def->os.arch))
+    } else if (qemuDomainIsARMVirt(def) ||
+               qemuDomainIsRISCVVirt(def) ||
+               ARCH_IS_S390(def->os.arch)) {
         return VIR_DOMAIN_VIDEO_TYPE_VIRTIO;
-    else
-        return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+    } else {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA))
+            return VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA))
+            return VIR_DOMAIN_VIDEO_TYPE_VGA;
+        return VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
+    }
 }
 
 
 static int
 qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video,
-                                  const virDomainDef *def)
+                                  const virDomainDef *def,
+                                  virQEMUCapsPtr qemuCaps)
 {
     if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT)
-        video->type = qemuDomainDefaultVideoDevice(def);
+        video->type = qemuDomainDefaultVideoDevice(def, qemuCaps);
 
     if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
         !video->vgamem) {
@@ -7993,7 +8000,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
         break;
 
     case VIR_DOMAIN_DEVICE_VIDEO:
-        ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def);
+        ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def, qemuCaps);
         break;
 
     case VIR_DOMAIN_DEVICE_PANIC: