External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: set domain capability for video type "none"

Browse Source 
In a follow-up commit, we will use the domain capabilities to validate
video device configurations, which means that we also need to make sure
that the domain capabilities include the "none" video device.

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:13 -05:00 committed by Cole Robinson
parent eecab2e80b
commit d5e9f47e76
81 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -5380,6 +5380,7 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
dev->supported = VIR_TRISTATE_BOOL_YES;
dev->modelType.report = true;
VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_NONE);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VGA))
VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VGA);
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_CIRRUS_VGA))

1
tests/domaincapsdata/qemu_1.5.3-q35.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.5.3-tcg.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.5.3.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.6.0-q35.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.6.0-tcg.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.6.0.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.7.0-q35.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.7.0-tcg.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_1.7.0.x86_64.xml
View File

@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.1.1-q35.x86_64.xml
View File

@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.1.1-tcg.x86_64.xml
View File

@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.1.1.x86_64.xml
View File

@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.10.0-q35.x86_64.xml
View File

@ -114,6 +114,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.10.0-tcg.x86_64.xml
View File

@ -133,6 +133,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.10.0-virt.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.10.0.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.10.0.ppc64.xml
View File

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

1
tests/domaincapsdata/qemu_2.10.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.10.0.x86_64.xml
View File

@ -114,6 +114,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
View File

@ -112,6 +112,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.11.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.11.0.x86_64.xml
View File

@ -112,6 +112,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
View File

@ -139,6 +139,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.12.0.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.12.0.ppc64.xml
View File

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

1
tests/domaincapsdata/qemu_2.12.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.12.0.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.4.0-q35.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.4.0-tcg.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.4.0.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.5.0-q35.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.5.0-tcg.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.5.0.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.6.0-q35.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.6.0-tcg.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.6.0-virt.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.6.0.aarch64.xml
View File

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

1
tests/domaincapsdata/qemu_2.6.0.ppc64.xml
View File

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

1
tests/domaincapsdata/qemu_2.6.0.x86_64.xml
View File

@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.7.0-q35.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.7.0-tcg.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.7.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.7.0.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.8.0-q35.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.8.0-tcg.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.8.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.8.0.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.9.0-q35.x86_64.xml
View File

@ -109,6 +109,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

1
tests/domaincapsdata/qemu_2.9.0-tcg.x86_64.xml
View File

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

1
tests/domaincapsdata/qemu_2.9.0.ppc64.xml
View File

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

1
tests/domaincapsdata/qemu_2.9.0.s390x.xml
View File

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

1
tests/domaincapsdata/qemu_2.9.0.x86_64.xml
View File

@ -109,6 +109,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>

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

@ -124,6 +124,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -139,6 +139,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

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

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

@ -124,6 +124,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

1
tests/domaincapsdata/qemu_3.1.0.ppc64.xml
View File

@ -65,6 +65,7 @@
<value>vga</value>
<value>cirrus</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>

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

@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -101,6 +101,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -99,6 +99,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

1
tests/domaincapsdata/qemu_4.0.0.ppc64.xml
View File

@ -66,6 +66,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>

1
tests/domaincapsdata/qemu_4.0.0.s390x.xml
View File

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

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

@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -101,6 +101,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

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

@ -99,6 +99,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>

1
tests/domaincapsdata/qemu_4.2.0.ppc64.xml
View File

@ -66,6 +66,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>

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

@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>