[libvirt] [PATCH 1/2] qemu: caps: add QEMU_CAPS_CIRRUS_VGAMEM capability

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 8 ++ src/qemu/qemu_capabilities.h | 1 + .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 58 ++++++++++---- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 62 +++++++++++---- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 44 ++++++----- .../caps_2.10.0.x86_64.replies | 91 ++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 67 ++++++++++++---- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 69 +++++++++++----- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.replies | 44 ++++++----- .../caps_2.6.0-gicv3.aarch64.replies | 44 ++++++----- .../caps_2.6.0.ppc64le.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 69 +++++++++++----- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 40 ++++++---- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 74 +++++++++++++----- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 74 +++++++++++++----- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + .../caps_2.9.0.ppc64le.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 44 ++++++----- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 91 ++++++++++++++++------ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + 37 files changed, 948 insertions(+), 387 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f9028157f1..93e7d6d510 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -443,6 +443,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 270 */ "vxhs", "virtio-blk.num-queues", + "cirrus-vga.vgamem_mb", ); @@ -1764,6 +1765,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsKVMPit[] = { { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY }, }; +static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsCirrus[] = { + { "vgamem_mb", QEMU_CAPS_CIRRUS_VGAMEM }, +}; + static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVGA[] = { { "vgamem_mb", QEMU_CAPS_VGA_VGAMEM }, }; @@ -1877,6 +1882,9 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { { "kvm-pit", virQEMUCapsObjectPropsKVMPit, ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit), -1 }, + { "cirrus-vga", virQEMUCapsObjectPropsCirrus, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsCirrus), + -1 }, { "VGA", virQEMUCapsObjectPropsVGA, ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA), -1 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2d16e5b0ef..59f2bd4d37 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -429,6 +429,7 @@ typedef enum { /* 270 */ QEMU_CAPS_VXHS, /* -drive file.driver=vxhs via query-qmp-schema */ QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ + QEMU_CAPS_CIRRUS_VGAMEM, /* -device cirrus-vga.vgamem_mb */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies index 62c31774c0..44fa84aa32 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies @@ -1495,13 +1495,39 @@ { "name": "addr", "type": "pci-devfn" + } + ], + "id": "libvirt-30" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" }, { "name": "vgamem_mb", "type": "uint32" } ], - "id": "libvirt-30" + "id": "libvirt-31" } { @@ -1531,7 +1557,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1597,11 +1623,11 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1609,7 +1635,7 @@ } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1617,7 +1643,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1659,11 +1685,11 @@ "type": "on/off" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { - "id": "libvirt-37", + "id": "libvirt-38", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1671,7 +1697,7 @@ } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1705,7 +1731,7 @@ "type": "uint32" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -1746,7 +1772,7 @@ "name": "none" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -1818,11 +1844,11 @@ "name": "Opteron_G4" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { - "id": "libvirt-42", + "id": "libvirt-43", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -1830,7 +1856,7 @@ } { - "id": "libvirt-43", + "id": "libvirt-44", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -1838,7 +1864,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-45", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -1852,7 +1878,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies index a5729740e2..33606fd6b8 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies @@ -1689,6 +1689,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -1697,7 +1727,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1727,7 +1757,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -1797,11 +1827,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1809,7 +1839,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1817,7 +1847,7 @@ } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1859,11 +1889,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1871,7 +1901,7 @@ } { - "id": "libvirt-39", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1925,7 +1955,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -1973,7 +2003,7 @@ "name": "none" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2051,11 +2081,11 @@ "name": "Opteron_G5" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { - "id": "libvirt-43", + "id": "libvirt-44", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -2063,7 +2093,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-45", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -2071,7 +2101,7 @@ } { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -2085,7 +2115,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index 99384ce5e6..b86b45a37f 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -127,6 +127,7 @@ <flag name='nec-usb-xhci-ports'/> <flag name='display'/> <flag name='query-cpu-definitions'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>1003001</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies index 01c75f0d1e..9678119b28 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies @@ -1736,6 +1736,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -1744,7 +1774,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1774,7 +1804,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -1844,11 +1874,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1856,7 +1886,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1864,7 +1894,7 @@ } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -1906,11 +1936,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -1918,7 +1948,7 @@ } { - "id": "libvirt-39", + "id": "libvirt-40", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-device' not found" @@ -1972,7 +2002,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2023,7 +2053,7 @@ "name": "none" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2101,11 +2131,11 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { - "id": "libvirt-43", + "id": "libvirt-44", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-models has not been found" @@ -2113,7 +2143,7 @@ } { - "id": "libvirt-44", + "id": "libvirt-45", "error": { "class": "CommandNotFound", "desc": "The command query-tpm-types has not been found" @@ -2121,7 +2151,7 @@ } { - "id": "libvirt-45", + "id": "libvirt-46", "error": { "class": "CommandNotFound", "desc": "The command query-command-line-options has not been found" @@ -2135,7 +2165,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index aea043c57d..1a1f24a77e 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -128,6 +128,7 @@ <flag name='nec-usb-xhci-ports'/> <flag name='display'/> <flag name='query-cpu-definitions'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>1004002</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index e8d76cfdef..b0d1d9cd50 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1839,6 +1839,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -1847,7 +1877,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1877,7 +1907,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -1947,11 +1977,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -1959,7 +1989,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -1967,7 +1997,7 @@ } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2009,11 +2039,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2023,7 +2053,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2073,7 +2103,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2146,7 +2176,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2224,19 +2254,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -2937,7 +2967,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -2947,7 +2977,7 @@ "capability": "xbzrle" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 6f860e4f25..220a5374c8 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -140,6 +140,7 @@ <flag name='vhost-scsi'/> <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index eef8d30238..c84f77d95b 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1884,6 +1884,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -1892,7 +1922,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1922,7 +1952,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -1992,11 +2022,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -2004,7 +2034,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2012,7 +2042,7 @@ } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2054,11 +2084,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2068,7 +2098,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2118,7 +2148,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2199,7 +2229,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2277,19 +2307,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -2892,7 +2922,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -2914,7 +2944,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index e5dc8360de..0355a91eb0 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -145,6 +145,7 @@ <flag name='vhost-scsi'/> <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 416ece1afb..9100fac502 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1901,6 +1901,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "string" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -1909,7 +1939,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -1939,7 +1969,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2009,11 +2039,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -2021,7 +2051,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2029,7 +2059,7 @@ } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2071,11 +2101,11 @@ "type": "on/off" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2085,7 +2115,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2135,7 +2165,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2224,7 +2254,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2302,19 +2332,19 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -3107,7 +3137,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -3129,7 +3159,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 86d87eaf0c..9ac3f6feab 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -147,6 +147,7 @@ <flag name='vhost-scsi'/> <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index 52546ad3c9..4588019259 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -2256,6 +2256,36 @@ "type": "pci-devfn" }, { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "command_serr_enable", + "type": "on/off" + }, + { + "name": "multifunction", + "type": "on/off" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "type": "pci-devfn" + }, + { "name": "mmio", "type": "on/off" }, @@ -2264,7 +2294,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2294,7 +2324,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2364,11 +2394,11 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { - "id": "libvirt-34", + "id": "libvirt-35", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-pci' not found" @@ -2376,7 +2406,7 @@ } { - "id": "libvirt-35", + "id": "libvirt-36", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-gpu-device' not found" @@ -2434,7 +2464,7 @@ "type": "pci-devfn" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -2484,11 +2514,11 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -2498,7 +2528,7 @@ { "return": [ ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -2552,7 +2582,7 @@ "type": "on/off" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -2657,7 +2687,7 @@ "cpu-max": 255 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2738,21 +2768,21 @@ "name": "qemu64" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ "tpm-tis" ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "passthrough" ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -3612,7 +3642,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -3634,7 +3664,7 @@ "capability": "zero-blocks" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index 2fa551b1a0..891705c7af 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -163,6 +163,7 @@ <flag name='query-cpu-definitions'/> <flag name='query-named-block-nodes'/> <flag name='kernel-irqchip'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index 2958c3eaa8..5f93ecf4b1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -2975,7 +2975,7 @@ "id": "libvirt-31", "error": { "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" + "desc": "Device 'cirrus-vga' not found" } } @@ -2983,7 +2983,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" + "desc": "Device 'VGA' not found" } } @@ -2991,6 +2991,14 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", + "desc": "Device 'vmware-svga' not found" + } +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", "desc": "Device 'qxl' not found" } } @@ -3143,7 +3151,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3190,11 +3198,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3341,7 +3349,7 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3403,7 +3411,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3447,11 +3455,11 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { - "id": "libvirt-40", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Device 'nec-usb-xhci' not found" @@ -3503,7 +3511,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -4037,19 +4045,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -5154,7 +5162,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -5204,7 +5212,7 @@ "capability": "return-path" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -14927,7 +14935,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -14967,11 +14975,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { - "id": "libvirt-49", + "id": "libvirt-50", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 5ddaa0316b..13e5995fe3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -3675,6 +3675,53 @@ "type": "uint32" }, { + "name": "blitter", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" @@ -3722,7 +3769,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3765,7 +3812,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3860,7 +3907,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -4021,7 +4068,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -4078,7 +4125,7 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -4174,7 +4221,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -4317,11 +4364,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4369,7 +4416,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -4449,7 +4496,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4484,7 +4531,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -4673,7 +4720,7 @@ "alias": "q35" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -5008,21 +5055,21 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -6301,7 +6348,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -6351,7 +6398,7 @@ "capability": "return-path" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -16074,7 +16121,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -16253,7 +16300,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -16496,7 +16543,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -16675,7 +16722,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-52" } { @@ -16918,7 +16965,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-53" } { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 10a182e185..4f79807729 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -224,6 +224,7 @@ <flag name='virtio-gpu.max_outputs'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <package> (v2.10.0)</package> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index 9f256c48a4..e05f88ddad 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -2576,6 +2576,39 @@ { "return": [ { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + }, + { + "name": "vgamem_mb", + "type": "uint32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { "name": "big-endian-framebuffer", "type": "bool" }, @@ -2617,7 +2650,7 @@ "type": "uint32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2650,7 +2683,7 @@ "type": "uint32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2727,7 +2760,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2808,7 +2841,7 @@ "type": "bool" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2838,7 +2871,7 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -2915,7 +2948,7 @@ "type": "bool" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3000,11 +3033,11 @@ "type": "uint32" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3047,7 +3080,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3117,7 +3150,7 @@ "type": "bool" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3127,7 +3160,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3256,7 +3289,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -3346,21 +3379,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4368,7 +4401,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -4398,7 +4431,7 @@ "capability": "events" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index f97e4cb813..3e816f2830 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -188,6 +188,7 @@ <flag name='vnc-multi-servers'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 876bc2f0a4..c5b32118dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -2693,6 +2693,39 @@ "type": "uint32" }, { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { "name": "mmio", "description": "on/off", "type": "bool" @@ -2730,7 +2763,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2763,7 +2796,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2840,7 +2873,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -2946,7 +2979,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2986,7 +3019,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3063,7 +3096,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3163,11 +3196,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3210,7 +3243,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3280,7 +3313,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3290,7 +3323,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3427,7 +3460,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -3517,21 +3550,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4576,7 +4609,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -4610,7 +4643,7 @@ "capability": "x-postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -12155,7 +12188,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 2ba40fc494..317e5ba75f 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -194,6 +194,7 @@ <flag name='vnc-multi-servers'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies index 219616aa3b..9b5c37501f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies @@ -3246,6 +3246,14 @@ } { + "id": "libvirt-31", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'cirrus-vga' not found" + } +} + +{ "return": [ { "name": "rombar", @@ -3289,11 +3297,11 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3301,7 +3309,7 @@ } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3401,7 +3409,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3431,11 +3439,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3539,11 +3547,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3586,7 +3594,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3656,7 +3664,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3831,7 +3839,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3930,19 +3938,19 @@ "name": "pxa270" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -4914,7 +4922,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4948,7 +4956,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -12953,7 +12961,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -12969,7 +12977,7 @@ "kernel": true } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies index 7723c40970..7c2a3b011a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies @@ -3246,6 +3246,14 @@ } { + "id": "libvirt-31", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'cirrus-vga' not found" + } +} + +{ "return": [ { "name": "rombar", @@ -3289,11 +3297,11 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3301,7 +3309,7 @@ } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3401,7 +3409,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3431,11 +3439,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3539,11 +3547,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3586,7 +3594,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3656,7 +3664,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3831,7 +3839,7 @@ "cpu-max": 1 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3930,19 +3938,19 @@ "name": "pxa270" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -4914,7 +4922,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4948,7 +4956,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -12953,7 +12961,7 @@ "meta-type": "array" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -12969,7 +12977,7 @@ "kernel": false } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies index 2e4fa72daa..55dbdd3b45 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies @@ -3396,6 +3396,14 @@ } { + "id": "libvirt-31", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'cirrus-vga' not found" + } +} + +{ "return": [ { "name": "rombar", @@ -3439,11 +3447,11 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3451,7 +3459,7 @@ } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3551,7 +3559,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3581,11 +3589,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3689,11 +3697,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3736,7 +3744,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3806,7 +3814,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3852,7 +3860,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3924,7 +3932,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -5226,19 +5234,19 @@ "name": "MPC8541E_v11" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -6205,7 +6213,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -6239,7 +6247,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -14244,7 +14252,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index d6d0b5786d..2cf7f242c2 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -2775,6 +2775,39 @@ "type": "uint32" }, { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { "name": "mmio", "description": "on/off", "type": "bool" @@ -2812,7 +2845,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -2845,7 +2878,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -2922,7 +2955,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3028,7 +3061,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3068,7 +3101,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3145,7 +3178,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3245,11 +3278,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3292,7 +3325,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3362,7 +3395,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3372,7 +3405,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3485,7 +3518,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -3575,21 +3608,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4683,7 +4716,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -4717,7 +4750,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -12722,7 +12755,7 @@ "meta-type": "array" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index bdf006f6be..e3986ec8e2 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -204,6 +204,7 @@ <flag name='vnc-multi-servers'/> <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <package></package> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 95f15c106a..3c22376b81 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -2237,7 +2237,7 @@ "id": "libvirt-31", "error": { "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" + "desc": "Device 'cirrus-vga' not found" } } @@ -2245,7 +2245,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" + "desc": "Device 'VGA' not found" } } @@ -2253,6 +2253,14 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", + "desc": "Device 'vmware-svga' not found" + } +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", "desc": "Device 'qxl' not found" } } @@ -2354,7 +2362,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2384,11 +2392,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2496,7 +2504,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -2553,7 +2561,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2592,11 +2600,11 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { - "id": "libvirt-40", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Device 'nec-usb-xhci' not found" @@ -2633,7 +2641,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -2642,19 +2650,19 @@ "name": "host" } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -3590,7 +3598,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -3624,7 +3632,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -11980,7 +11988,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 671a958be6..fee0310b8e 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -2934,6 +2934,44 @@ "type": "bool" }, { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on/off", + "type": "bool" + }, + { "name": "mmio", "description": "on/off", "type": "bool" @@ -2971,7 +3009,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3009,7 +3047,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3091,7 +3129,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3201,7 +3239,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3241,7 +3279,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3327,7 +3365,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3431,11 +3469,11 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3478,7 +3516,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3553,7 +3591,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3567,7 +3605,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3716,7 +3754,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -3809,21 +3847,21 @@ "name": "qemu64" } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4921,7 +4959,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -4955,7 +4993,7 @@ "capability": "postcopy-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -13311,7 +13349,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index 59adff6c97..a4d5d73c4a 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -208,6 +208,7 @@ <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> <flag name='virtio-blk.num-queues'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <package> (v2.7.0)</package> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index ae214aa7b5..0542942fbd 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2500,7 +2500,7 @@ "id": "libvirt-31", "error": { "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" + "desc": "Device 'cirrus-vga' not found" } } @@ -2508,7 +2508,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" + "desc": "Device 'VGA' not found" } } @@ -2516,6 +2516,14 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", + "desc": "Device 'vmware-svga' not found" + } +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", "desc": "Device 'qxl' not found" } } @@ -2622,7 +2630,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2652,11 +2660,11 @@ "type": "uint32" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -2769,7 +2777,7 @@ "type": "bool" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -2826,7 +2834,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -2865,11 +2873,11 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { - "id": "libvirt-40", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Device 'nec-usb-xhci' not found" @@ -2911,7 +2919,7 @@ "alias": "s390-ccw-virtio" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3237,19 +3245,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -4210,7 +4218,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4248,7 +4256,7 @@ "capability": "x-colo" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -13018,7 +13026,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -13044,11 +13052,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { - "id": "libvirt-49", + "id": "libvirt-50", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index 3087d76807..0099583d70 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -3049,6 +3049,44 @@ "type": "bool" }, { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on/off", + "type": "bool" + }, + { "name": "mmio", "description": "on/off", "type": "bool" @@ -3086,7 +3124,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3124,7 +3162,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3206,7 +3244,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3325,7 +3363,7 @@ "type": "uint32" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3365,7 +3403,7 @@ "type": "bool" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3451,7 +3489,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3564,11 +3602,11 @@ "type": "guest statistics" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3611,7 +3649,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3686,7 +3724,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -3709,7 +3747,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3878,7 +3916,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -4084,21 +4122,21 @@ "static": false } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -5221,7 +5259,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -5259,7 +5297,7 @@ "capability": "x-colo" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -14029,7 +14067,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 88029c04dd..895dd2f0af 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -210,6 +210,7 @@ <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> <flag name='virtio-blk.num-queues'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <package> (v2.8.0)</package> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies index 0b286dc967..cc23e2b97a 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.replies @@ -3734,6 +3734,14 @@ } { + "id": "libvirt-31", + "error": { + "class": "DeviceNotFound", + "desc": "Device 'cirrus-vga' not found" + } +} + +{ "return": [ { "name": "rombar", @@ -3787,11 +3795,11 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { - "id": "libvirt-32", + "id": "libvirt-33", "error": { "class": "DeviceNotFound", "desc": "Device 'vmware-svga' not found" @@ -3799,7 +3807,7 @@ } { - "id": "libvirt-33", + "id": "libvirt-34", "error": { "class": "DeviceNotFound", "desc": "Device 'qxl' not found" @@ -3946,7 +3954,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3985,11 +3993,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -4136,11 +4144,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -4188,7 +4196,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -4268,7 +4276,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4354,7 +4362,7 @@ "type": "uint32" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -4467,7 +4475,7 @@ "cpu-max": 1 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -6643,19 +6651,19 @@ "static": false } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -7765,7 +7773,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -7807,7 +7815,7 @@ "capability": "release-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -17093,7 +17101,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 2f310d416a..c448ed9b27 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -2690,7 +2690,7 @@ "id": "libvirt-31", "error": { "class": "DeviceNotFound", - "desc": "Device 'VGA' not found" + "desc": "Device 'cirrus-vga' not found" } } @@ -2698,7 +2698,7 @@ "id": "libvirt-32", "error": { "class": "DeviceNotFound", - "desc": "Device 'vmware-svga' not found" + "desc": "Device 'VGA' not found" } } @@ -2706,6 +2706,14 @@ "id": "libvirt-33", "error": { "class": "DeviceNotFound", + "desc": "Device 'vmware-svga' not found" + } +} + +{ + "id": "libvirt-34", + "error": { + "class": "DeviceNotFound", "desc": "Device 'qxl' not found" } } @@ -2850,7 +2858,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -2889,11 +2897,11 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { - "id": "libvirt-36", + "id": "libvirt-37", "error": { "class": "DeviceNotFound", "desc": "Device 'ICH9-LPC' not found" @@ -3040,7 +3048,7 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { @@ -3102,7 +3110,7 @@ "type": "uint32" } ], - "id": "libvirt-38" + "id": "libvirt-39" } { @@ -3146,11 +3154,11 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { - "id": "libvirt-40", + "id": "libvirt-41", "error": { "class": "DeviceNotFound", "desc": "Device 'nec-usb-xhci' not found" @@ -3197,7 +3205,7 @@ "cpu-max": 248 } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -3587,19 +3595,19 @@ "migration-safe": true } ], - "id": "libvirt-42" + "id": "libvirt-43" } { "return": [ ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ ], - "id": "libvirt-44" + "id": "libvirt-45" } { @@ -4674,7 +4682,7 @@ "option": "drive" } ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -4716,7 +4724,7 @@ "capability": "release-ram" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -14002,7 +14010,7 @@ "meta-type": "object" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -14029,11 +14037,11 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-49" } { - "id": "libvirt-49", + "id": "libvirt-50", "error": { "class": "GenericError", "desc": "Property '.migratable' not found" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 37fbb6d80e..60d5bb589c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -3247,6 +3247,53 @@ "type": "uint32" }, { + "name": "blitter", + "type": "bool" + }, + { + "name": "x-pcie-lnksta-dllla", + "description": "on/off", + "type": "bool" + }, + { + "name": "multifunction", + "description": "on/off", + "type": "bool" + }, + { + "name": "romfile", + "type": "str" + }, + { + "name": "vgamem_mb", + "type": "uint32" + }, + { + "name": "x-pcie-extcap-init", + "description": "on/off", + "type": "bool" + }, + { + "name": "command_serr_enable", + "description": "on/off", + "type": "bool" + }, + { + "name": "addr", + "description": "Slot and optional function number, example: 06.0 or 06", + "type": "int32" + } + ], + "id": "libvirt-31" +} + +{ + "return": [ + { + "name": "rombar", + "type": "uint32" + }, + { "name": "x-pcie-lnksta-dllla", "description": "on/off", "type": "bool" @@ -3294,7 +3341,7 @@ "type": "int32" } ], - "id": "libvirt-31" + "id": "libvirt-32" } { @@ -3337,7 +3384,7 @@ "type": "int32" } ], - "id": "libvirt-32" + "id": "libvirt-33" } { @@ -3424,7 +3471,7 @@ "type": "uint32" } ], - "id": "libvirt-33" + "id": "libvirt-34" } { @@ -3577,7 +3624,7 @@ "type": "str" } ], - "id": "libvirt-34" + "id": "libvirt-35" } { @@ -3626,7 +3673,7 @@ "type": "size" } ], - "id": "libvirt-35" + "id": "libvirt-36" } { @@ -3722,7 +3769,7 @@ "type": "uint32" } ], - "id": "libvirt-36" + "id": "libvirt-37" } { @@ -3865,11 +3912,11 @@ "type": "str" } ], - "id": "libvirt-37" + "id": "libvirt-38" } { - "id": "libvirt-38", + "id": "libvirt-39", "error": { "class": "DeviceNotFound", "desc": "Device 'virtio-balloon-ccw' not found" @@ -3917,7 +3964,7 @@ "type": "bool" } ], - "id": "libvirt-39" + "id": "libvirt-40" } { @@ -3997,7 +4044,7 @@ "type": "uint32" } ], - "id": "libvirt-40" + "id": "libvirt-41" } { @@ -4028,7 +4075,7 @@ "type": "bool" } ], - "id": "libvirt-41" + "id": "libvirt-42" } { @@ -4207,7 +4254,7 @@ "cpu-max": 255 } ], - "id": "libvirt-42" + "id": "libvirt-43" } { @@ -4489,21 +4536,21 @@ "migration-safe": true } ], - "id": "libvirt-43" + "id": "libvirt-44" } { "return": [ "tpm-tis" ], - "id": "libvirt-44" + "id": "libvirt-45" } { "return": [ "passthrough" ], - "id": "libvirt-45" + "id": "libvirt-46" } { @@ -5752,7 +5799,7 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-47" } { @@ -5794,7 +5841,7 @@ "capability": "release-ram" } ], - "id": "libvirt-47" + "id": "libvirt-48" } { @@ -15080,7 +15127,7 @@ "meta-type": "object" } ], - "id": "libvirt-48" + "id": "libvirt-49" } { @@ -15259,7 +15306,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-50" } { @@ -15500,7 +15547,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-51" } { @@ -15679,7 +15726,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-52" } { @@ -15920,7 +15967,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-53" } { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index e3ff127270..799f06564c 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -221,6 +221,7 @@ <flag name='chardev-reconnect'/> <flag name='virtio-gpu.max_outputs'/> <flag name='virtio-blk.num-queues'/> + <flag name='cirrus-vga.vgamem_mb'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <package> (v2.9.0)</package> -- 2.13.6