External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Check for qxl's max_outputs parameter

Browse Source 
Add capabilities for both qxl and qxl-vga devices.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2015-12-11 14:26:24 +01:00
parent 71cddab042
commit 6e81a1f9ef
5 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_capabilities.c
View File

@ -329,6 +329,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"nec-usb-xhci-ports", "nec-usb-xhci-ports",
"virtio-scsi-pci.iothread", "virtio-scsi-pci.iothread",
"name-guest", "name-guest",
"qxl.max_outputs", /* 225 */
"qxl-vga.max_outputs",
); );
@ -1643,11 +1646,13 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVmwareSvga[] = {
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
{ "vgamem_mb", QEMU_CAPS_QXL_VGAMEM }, { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM },
{ "vram64_size_mb", QEMU_CAPS_QXL_VRAM64 }, { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64 },
{ "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = {
{ "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM }, { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM },
{ "vram64_size_mb", QEMU_CAPS_QXL_VGA_VRAM64 }, { "vram64_size_mb", QEMU_CAPS_QXL_VGA_VRAM64 },
{ "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS },
}; };
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = { static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {

4
src/qemu/qemu_capabilities.h
View File

@ -361,6 +361,10 @@ typedef enum {
QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */ QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
QEMU_CAPS_NAME_GUEST, /* -name guest= */ QEMU_CAPS_NAME_GUEST, /* -name guest= */
/* 225 */
QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
QEMU_CAPS_LAST /* this must always be the last item */ QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags; } virQEMUCapsFlags;

2
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -178,6 +178,8 @@
<flag name='nec-usb-xhci-ports'/> <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/> <flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/> <flag name='name-guest'/>
<flag name='qxl.max_outputs'/>
<flag name='qxl-vga.max_outputs'/>
<version>2004000</version> <version>2004000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<package></package> <package></package>

2
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -182,6 +182,8 @@
<flag name='nec-usb-xhci-ports'/> <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/> <flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/> <flag name='name-guest'/>
<flag name='qxl.max_outputs'/>
<flag name='qxl-vga.max_outputs'/>
<version>2005000</version> <version>2005000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<package></package> <package></package>

2
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -188,6 +188,8 @@
<flag name='nec-usb-xhci-ports'/> <flag name='nec-usb-xhci-ports'/>
<flag name='virtio-scsi-pci.iothread'/> <flag name='virtio-scsi-pci.iothread'/>
<flag name='name-guest'/> <flag name='name-guest'/>
<flag name='qxl.max_outputs'/>
<flag name='qxl-vga.max_outputs'/>
<version>2006000</version> <version>2006000</version>
<kvmVersion>0</kvmVersion> <kvmVersion>0</kvmVersion>
<package></package> <package></package>