External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: set domain capability for ramfb device

Browse Source 
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>
This commit is contained in:
Jonathon Jongsma 2019-10-18 10:30:12 -05:00 committed by Cole Robinson
parent b964735609
commit eecab2e80b
22 changed files with 23 additions and 0 deletions

2
src/qemu/qemu_capabilities.c

@ -5392,6 +5392,8 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO); VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY)) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_BOCHS_DISPLAY))
VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_BOCHS); 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);
} }

1
tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml

@ -125,6 +125,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml

@ -140,6 +140,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.0.0.ppc64.xml

@ -65,6 +65,7 @@
<value>vga</value> <value>vga</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.0.0.s390x.xml

@ -158,6 +158,7 @@
<video supported='yes'> <video supported='yes'>
<enum name='modelType'> <enum name='modelType'>
<value>virtio</value> <value>virtio</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.0.0.x86_64.xml

@ -125,6 +125,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml

@ -128,6 +128,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml

@ -143,6 +143,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_3.1.0.x86_64.xml

@ -128,6 +128,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml

@ -128,6 +128,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml

@ -143,6 +143,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml

@ -102,6 +102,7 @@
<value>vmvga</value> <value>vmvga</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.0.0.aarch64.xml

@ -100,6 +100,7 @@
<value>vmvga</value> <value>vmvga</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.0.0.x86_64.xml

@ -128,6 +128,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml

@ -132,6 +132,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml

@ -143,6 +143,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.1.0.x86_64.xml

@ -132,6 +132,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml

@ -132,6 +132,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml

@ -143,6 +143,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml

@ -102,6 +102,7 @@
<value>vmvga</value> <value>vmvga</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.2.0.aarch64.xml

@ -100,6 +100,7 @@
<value>vmvga</value> <value>vmvga</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>

1
tests/domaincapsdata/qemu_4.2.0.x86_64.xml

@ -132,6 +132,7 @@
<value>qxl</value> <value>qxl</value>
<value>virtio</value> <value>virtio</value>
<value>bochs</value> <value>bochs</value>
<value>ramfb</value>
</enum> </enum>
</video> </video>
<hostdev supported='yes'> <hostdev supported='yes'>