From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Thu, 3 Oct 2019 13:28:40 +0000 (+0200)
Subject: qemu: capabilities: Fill in bochs-display info
X-Git-Tag: v5.9.0-rc1~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=371cff5789a0f1d616eaceb0fae5c21bafd3703c;p=thirdparty%2Flibvirt.git

qemu: capabilities: Fill in bochs-display info

086c19d69 added bochs-display capability but didn't fill in the info for
domain capabilities.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 105ec5887a..46a056340b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5372,6 +5372,8 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_QXL);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO);
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY))
+        VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_BOCHS);
 
     return 0;
 }
diff --git a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
index 402848442f..059403cebc 100644
--- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
@@ -127,6 +127,7 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>bochs</value>
       </enum>
     </video>
     <hostdev supported='yes'>
diff --git a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
index 1ffd5e3cc0..eb24b9a604 100644
--- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
@@ -127,6 +127,7 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>bochs</value>
       </enum>
     </video>
     <hostdev supported='yes'>
diff --git a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
index 79b41ef6da..f5685d2068 100644
--- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
@@ -131,6 +131,7 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>bochs</value>
       </enum>
     </video>
     <hostdev supported='yes'>
diff --git a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
index 6bdeb20479..5bd376bb2e 100644
--- a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
@@ -131,6 +131,7 @@
         <value>vmvga</value>
         <value>qxl</value>
         <value>virtio</value>
+        <value>bochs</value>
       </enum>
     </video>
     <hostdev supported='yes'>