提交 d5e9f47e 编写于 作者: J Jonathon Jongsma 提交者: Cole Robinson

qemu: set domain capability for video type "none"

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: NCole Robinson <crobinso@redhat.com>
Signed-off-by: NJonathon Jongsma <jjongsma@redhat.com>
上级 eecab2e8
......@@ -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))
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -93,6 +93,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>qxl</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -114,6 +114,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -133,6 +133,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -94,6 +94,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -92,6 +92,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -154,6 +154,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -114,6 +114,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -112,6 +112,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -128,6 +128,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -153,6 +153,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -112,6 +112,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -125,6 +125,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -139,6 +139,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -96,6 +96,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -94,6 +94,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -152,6 +152,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -125,6 +125,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -93,6 +93,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -91,6 +91,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -99,6 +99,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -57,6 +57,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -138,6 +138,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -100,6 +100,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -109,6 +109,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -132,6 +132,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -139,6 +139,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -109,6 +109,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -124,6 +124,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -139,6 +139,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -64,6 +64,7 @@
<enum name='modelType'>
<value>vga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -158,6 +158,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
<value>ramfb</value>
</enum>
</video>
......
......@@ -124,6 +124,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -65,6 +65,7 @@
<value>vga</value>
<value>cirrus</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>
......
......@@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -101,6 +101,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -99,6 +99,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -66,6 +66,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>
......
......@@ -164,6 +164,7 @@
<video supported='yes'>
<enum name='modelType'>
<value>virtio</value>
<value>none</value>
</enum>
</video>
<hostdev supported='yes'>
......
......@@ -127,6 +127,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -142,6 +142,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -101,6 +101,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -99,6 +99,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
......@@ -66,6 +66,7 @@
<value>cirrus</value>
<value>vmvga</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
</enum>
</video>
......
......@@ -131,6 +131,7 @@
<value>vmvga</value>
<value>qxl</value>
<value>virtio</value>
<value>none</value>
<value>bochs</value>
<value>ramfb</value>
</enum>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册