[libvirt] [PATCH v2 3/4] caps: introduce new qemu capability for vgamem_mb device property
Pavel Hrdina
phrdina at redhat.com
Fri Nov 14 13:54:28 UTC 2014
Allow setting vgamem size for video devices.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1076098
Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
src/qemu/qemu_capabilities.c | 25 ++++++
src/qemu/qemu_capabilities.h | 3 +
tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 +
tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 100 +++++++++++++++++++--
tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 108 +++++++++++++++++++++--
tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 108 +++++++++++++++++++++--
tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 108 +++++++++++++++++++++--
tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 108 +++++++++++++++++++++--
tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 3 +
tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 108 +++++++++++++++++++++--
tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 3 +
tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 108 +++++++++++++++++++++--
16 files changed, 747 insertions(+), 49 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index cbdc08b..b222c52 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -272,6 +272,10 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"migrate-rdma",
"ivshmem",
"drive-iotune-max",
+
+ "cirrus-vga.vgamem_mb", /* 180 */
+ "VGA.vgamem_mb",
+ "vmware-svga.vgamem_mb",
);
@@ -1582,6 +1586,18 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsKVMPit[] = {
{ "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY },
};
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsCirrusVga[] = {
+ { "vgamem_mb", QEMU_CAPS_CIRRUS_VGA_VGAMEM },
+};
+
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVGA[] = {
+ { "vgamem_mb", QEMU_CAPS_VGA_VGAMEM },
+};
+
+static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVmwareSvga[] = {
+ { "vgamem_mb", QEMU_CAPS_VMWARE_SVGA_VGAMEM },
+};
+
struct virQEMUCapsObjectTypeProps {
const char *type;
struct virQEMUCapsStringFlags *props;
@@ -1627,6 +1643,12 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
ARRAY_CARDINALITY(virQEMUCapsObjectPropsUSBStorage) },
{ "kvm-pit", virQEMUCapsObjectPropsKVMPit,
ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) },
+ { "cirrus-vga", virQEMUCapsObjectPropsCirrusVga,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsCirrusVga) },
+ { "VGA", virQEMUCapsObjectPropsVGA,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsVGA) },
+ { "vmware-svga", virQEMUCapsObjectPropsVmwareSvga,
+ ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga) },
};
@@ -1818,6 +1840,9 @@ virQEMUCapsExtractDeviceStr(const char *qemu,
"-device", "usb-host,?",
"-device", "scsi-generic,?",
"-device", "usb-storage,?",
+ "-device", "cirrus-vga,?",
+ "-device", "VGA,?",
+ "-device", "vmware-svga,?",
NULL);
/* qemu -help goes to stdout, but qemu -device ? goes to stderr. */
virCommandSetErrorBuffer(cmd, &output);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index ffe3494..c8f0f14 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -219,6 +219,9 @@ typedef enum {
QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */
QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */
QEMU_CAPS_DRIVE_IOTUNE_MAX = 179, /* -drive bps_max= and friends */
+ QEMU_CAPS_CIRRUS_VGA_VGAMEM = 180, /* -device cirrus-vga.vgamem_mb */
+ QEMU_CAPS_VGA_VGAMEM = 181, /* -device VGA.vgamem_mb */
+ QEMU_CAPS_VMWARE_SVGA_VGAMEM = 182, /* -device vmware-svga.vgamem_mb */
QEMU_CAPS_LAST, /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
index fc8dfc1..63fc139 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -116,4 +116,6 @@
<flag name='host-pci-multidomain'/>
<flag name='usb-audio'/>
<flag name='ivshmem'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
index 4fce9d7..d29a36f 100644
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies
@@ -1408,6 +1408,92 @@
{
"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"
+ }
+ ],
+ "id": "libvirt-27"
+}
+
+{
+ "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-28"
+}
+
+{
+ "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-29"
+}
+
+{
+ "return": [
+ {
"name": "xenpv"
},
{
@@ -1449,7 +1535,7 @@
"name": "none"
}
],
- "id": "libvirt-26"
+ "id": "libvirt-30"
}
{
@@ -1521,7 +1607,7 @@
"name": "Opteron_G4"
}
],
- "id": "libvirt-27"
+ "id": "libvirt-31"
}
{
@@ -1529,11 +1615,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-28"
+ "id": "libvirt-32"
}
{
- "id": "libvirt-29",
+ "id": "libvirt-33",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -1541,7 +1627,7 @@
}
{
- "id": "libvirt-30",
+ "id": "libvirt-34",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -1549,7 +1635,7 @@
}
{
- "id": "libvirt-31",
+ "id": "libvirt-35",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -1563,5 +1649,5 @@
"state": false
}
],
- "id": "libvirt-32"
+ "id": "libvirt-36"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index f4f0397..452b285 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -130,4 +130,7 @@
<flag name='host-pci-multidomain'/>
<flag name='usb-audio'/>
<flag name='ivshmem'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
index 43713b2..5fbeb0c 100644
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies
@@ -1575,6 +1575,100 @@
{
"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-27"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-28"
+}
+
+{
+ "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-29"
+}
+
+{
+ "return": [
+ {
"name": "xenpv"
},
{
@@ -1623,7 +1717,7 @@
"name": "none"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-30"
}
{
@@ -1701,7 +1795,7 @@
"name": "Opteron_G5"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-31"
}
{
@@ -1709,11 +1803,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-32"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-33",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -1721,7 +1815,7 @@
}
{
- "id": "libvirt-32",
+ "id": "libvirt-34",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -1729,7 +1823,7 @@
}
{
- "id": "libvirt-33",
+ "id": "libvirt-35",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -1743,5 +1837,5 @@
"state": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-36"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index e6659e4..658da0b 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -131,4 +131,7 @@
<flag name='host-pci-multidomain'/>
<flag name='usb-audio'/>
<flag name='ivshmem'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
index 34384f8..0dee35c 100644
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies
@@ -1622,6 +1622,100 @@
{
"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-27"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-28"
+}
+
+{
+ "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-29"
+}
+
+{
+ "return": [
+ {
"name": "xenpv"
},
{
@@ -1673,7 +1767,7 @@
"name": "none"
}
],
- "id": "libvirt-28"
+ "id": "libvirt-30"
}
{
@@ -1751,7 +1845,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-31"
}
{
@@ -1759,11 +1853,11 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-32"
}
{
- "id": "libvirt-31",
+ "id": "libvirt-33",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-models has not been found"
@@ -1771,7 +1865,7 @@
}
{
- "id": "libvirt-32",
+ "id": "libvirt-34",
"error": {
"class": "CommandNotFound",
"desc": "The command query-tpm-types has not been found"
@@ -1779,7 +1873,7 @@
}
{
- "id": "libvirt-33",
+ "id": "libvirt-35",
"error": {
"class": "CommandNotFound",
"desc": "The command query-command-line-options has not been found"
@@ -1793,5 +1887,5 @@
"state": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-36"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index 9716cf5..09949f8 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -140,4 +140,7 @@
<flag name='usb-audio'/>
<flag name='splash-timeout'/>
<flag name='ivshmem'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
index 4613472..6b84488 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies
@@ -1696,6 +1696,100 @@
{
"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-28"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-29"
+}
+
+{
+ "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"
+}
+
+{
+ "return": [
+ {
"name": "pc-q35-1.4",
"cpu-max": 255
},
@@ -1763,7 +1857,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-28"
+ "id": "libvirt-31"
}
{
@@ -1841,7 +1935,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-32"
}
{
@@ -1849,19 +1943,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-31"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-32"
+ "id": "libvirt-35"
}
{
@@ -2537,7 +2631,7 @@
"option": "drive"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-36"
}
{
@@ -2547,5 +2641,5 @@
"state": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-37"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index a820cd4..fb3e6d4 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -146,4 +146,7 @@
<flag name='usb-audio'/>
<flag name='splash-timeout'/>
<flag name='ivshmem'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
index 4205c89..15052be 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies
@@ -1758,6 +1758,100 @@
{
"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-28"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-29"
+}
+
+{
+ "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"
+}
+
+{
+ "return": [
+ {
"name": "xenpv",
"cpu-max": 1
},
@@ -1841,7 +1935,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-28"
+ "id": "libvirt-31"
}
{
@@ -1919,7 +2013,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-32"
}
{
@@ -1927,19 +2021,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-31"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-32"
+ "id": "libvirt-35"
}
{
@@ -2517,7 +2611,7 @@
"option": "drive"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-36"
}
{
@@ -2539,5 +2633,5 @@
"state": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-37"
}
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index f65b3f4..7d9f36e 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -146,4 +146,7 @@
<flag name='usb-audio'/>
<flag name='splash-timeout'/>
<flag name='ivshmem'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
index 7582385..38074e5 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies
@@ -1722,6 +1722,100 @@
{
"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-28"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-29"
+}
+
+{
+ "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"
+}
+
+{
+ "return": [
+ {
"name": "xenpv",
"cpu-max": 1
},
@@ -1813,7 +1907,7 @@
"cpu-max": 1
}
],
- "id": "libvirt-28"
+ "id": "libvirt-31"
}
{
@@ -1891,7 +1985,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-32"
}
{
@@ -1899,19 +1993,19 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-33"
}
{
"return": [
],
- "id": "libvirt-31"
+ "id": "libvirt-34"
}
{
"return": [
],
- "id": "libvirt-32"
+ "id": "libvirt-35"
}
{
@@ -2499,7 +2593,7 @@
"option": "drive"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-36"
}
{
@@ -2521,5 +2615,5 @@
"state": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-37"
}
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 7003ad8..dd8bb1a 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -161,4 +161,7 @@
<flag name='migrate-rdma'/>
<flag name='ivshmem'/>
<flag name='drive-iotune-max'/>
+ <flag name='cirrus-vga.vgamem_mb'/>
+ <flag name='VGA.vgamem_mb'/>
+ <flag name='vmware-svga.vgamem_mb'/>
</qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
index 74d09dc..5e27ac5 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.replies
@@ -2166,6 +2166,100 @@
}
{
+ "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-28"
+}
+
+{
+ "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"
+ },
+ {
+ "name": "vgamem_mb",
+ "type": "uint32"
+ }
+ ],
+ "id": "libvirt-29"
+}
+
+{
+ "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"
+}
+
+{
"return": [
{
"name": "pc-1.3",
@@ -2275,7 +2369,7 @@
"cpu-max": 255
}
],
- "id": "libvirt-28"
+ "id": "libvirt-31"
}
{
@@ -2356,7 +2450,7 @@
"name": "qemu64"
}
],
- "id": "libvirt-29"
+ "id": "libvirt-32"
}
{
@@ -2364,21 +2458,21 @@
"enabled": false,
"present": true
},
- "id": "libvirt-30"
+ "id": "libvirt-33"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-31"
+ "id": "libvirt-34"
}
{
"return": [
"passthrough"
],
- "id": "libvirt-32"
+ "id": "libvirt-35"
}
{
@@ -3238,7 +3332,7 @@
"option": "drive"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-36"
}
{
@@ -3260,5 +3354,5 @@
"capability": "zero-blocks"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-37"
}
--
2.0.4
More information about the libvir-list
mailing list