qemu: set domain capability for ramfb device

commit 9bfcf0f62d9cf16db526a948242a7409ae883209 added the
QEMU_CAPS_DEVICE_RAMFB capability but did not set the domain capability.
This patch sets the domain capability for the ramfb device and updates
the tests.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 033dd4254135758262b421765dcd733d1ad83cee..a917bc80aeffb0da2081dd5a998b7c55e0ee25e1 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5392,6 +5392,8 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
         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);
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RAMFB))
+        VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_RAMFB);
 }
 
 

diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index 44dc5d44d268df8a484f06ae30154220a6ad81e1..f3a40ad33d7a4112d9f2fbfa9f4dd371a9c85a6b 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -125,6 +125,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 489e4ae1f7a82024de73c37638c701116bae6f74..4b7a68ea32c8518bf21a9306ab5cd7529ac22fab 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -140,6 +140,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index 1a7f12c61543b6a98600f8648c3a21a537063d26..2b774e9a40a60f3fee41a1648515258c5612de16 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
@@ -65,6 +65,7 @@
         <value>vga</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
index 0e81e2ea3381bb126f683665dc43f5ccee21086f..d32f7b58755a0fbf90317e221ad17ee3ede40dc0 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
@@ -158,6 +158,7 @@
     <video supported='yes'>
       <enum name='modelType'>
         <value>virtio</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 8e10a3eb0e0af0e2fc65cd79bfe11a7c9dcc4bf4..8fbd4587b6a47fe45ba68968e8e083b9819d6223 100644 (file)
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -125,6 +125,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index 595476b87b94e59989b9b0ee5916cbdb44c32abc..d4373b8eef18b781e2702f9990c39bd66cb26a53 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -128,6 +128,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 82d31b3ff6b0dba0af2afedc4ce65a5f963b361a..98ad046c6eed1aded0c5fef5c25c3735c96e34a2 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -143,6 +143,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 059403cebc3ae73063669f8665ba55daff8d9710..ecb1f06e9015c524e3377728642f2d4914424d89 100644 (file)
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -128,6 +128,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index aba5bdf871ce9d34f8a67ff1eb53f4b71c80eb4b..6193677e158ea2d7801d3816c1efa1abc6cb2577 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -128,6 +128,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index 3630653ac918514dc248ea56e15561c673152ae7..3c8bb4fd3e3d68724425b81a8869e9095bafcbc6 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -143,6 +143,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index 9f9cc376a3e316f4ddf6a55f009b138f4dac2154..be1f688cf217b9a96e6829010783f83045237e38 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -102,6 +102,7 @@
         <value>vmvga</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 577edf81d735886c5f7df2e9aab8bee92f97f5da..ed63013811e29a898ae5e24e4c17ae53d58b83e5 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -100,6 +100,7 @@
         <value>vmvga</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index eb24b9a6048a845ebd96cdeed6b9e5e2fed6605c..2a475f20be2a68f379953a9d88f49528e3eb37e6 100644 (file)
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -128,6 +128,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 481aba2c41a04817b4011b597a2a160fea47071a..9259b0c00d1e3143f9bea13be847e815658d1ba5 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -132,6 +132,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index a7409505cb046c188e6ec8cf97d55d9338320b5a..892370953f4a69c60bacff1f6c4d0d06ae89d366 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -143,6 +143,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index f5685d2068db827e376227f98931c8fc1ed9cddc..07b869859cd0cbb0cc7a2d912267569b74d68307 100644 (file)
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -132,6 +132,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
index 8f6c6d3da61bbc3c3eac82da2d730c3c33728ed1..7b1bd8a4c6b7c802cdab34de6946a3b85a61c936 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -132,6 +132,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index 520d4ff7f2224ead8f639c9ffcdecb8993c36778..de48536043a4cb00518302c851e163276ae9904d 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -143,6 +143,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 85d9433f52288af7bb0eee76222b991a3c3a8a95..895f34e74d6aca7113079a4f95efa29f088664e9 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -102,6 +102,7 @@
         <value>vmvga</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index 577edf81d735886c5f7df2e9aab8bee92f97f5da..ed63013811e29a898ae5e24e4c17ae53d58b83e5 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -100,6 +100,7 @@
         <value>vmvga</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>

diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 5bd376bb2e837e4523ba03764cbea11f8df7f60f..2f86eac7f0f9e940d3a571190d132da75b492e5f 100644 (file)
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -132,6 +132,7 @@
         <value>qxl</value>
         <value>virtio</value>
         <value>bochs</value>
+        <value>ramfb</value>
       </enum>
     </video>
     <hostdev supported='yes'>