[libvirt] [PATCH v3 4/9] 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.
Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 2 ++
tests/domaincapsschemadata/qemu_3.0.0.s390x.xml | 1 +
tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml | 1 +
tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml | 1 +
tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml | 1 +
tests/domaincapsschemadata/qemu_4.2.0.aarch64.xml | 1 +
tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml | 1 +
7 files changed, 8 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3ce1556fc2..381e7bcf34 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5400,6 +5400,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);
return 0;
}
diff --git a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
b/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
index 0e81e2ea33..d32f7b5875 100644
--- a/tests/domaincapsschemadata/qemu_3.0.0.s390x.xml
+++ b/tests/domaincapsschemadata/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/domaincapsschemadata/qemu_3.1.0.x86_64.xml
b/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
index 059403cebc..ecb1f06e90 100644
--- a/tests/domaincapsschemadata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsschemadata/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/domaincapsschemadata/qemu_4.0.0.x86_64.xml
b/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
index eb24b9a604..2a475f20be 100644
--- a/tests/domaincapsschemadata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsschemadata/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/domaincapsschemadata/qemu_4.1.0.x86_64.xml
b/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
index f5685d2068..07b869859c 100644
--- a/tests/domaincapsschemadata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsschemadata/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/domaincapsschemadata/qemu_4.2.0.aarch64.xml
b/tests/domaincapsschemadata/qemu_4.2.0.aarch64.xml
index b53c29c482..c384ae2f9a 100644
--- a/tests/domaincapsschemadata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsschemadata/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/domaincapsschemadata/qemu_4.2.0.x86_64.xml
b/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
index 5bd376bb2e..2f86eac7f0 100644
--- a/tests/domaincapsschemadata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsschemadata/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'>
--
2.21.0