qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6762e4c6b4f7e421b9a3b060f53a87b1d9f391fa..355b76e1f82c7f1589b7bff21b3bc45c6563ff6e 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -316,6 +316,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "virtio-balloon-pci.deflate-on-oom",
               "mptsas1068",
               "spice-gl",
+              "qxl.vram64_size_mb",
+
+              "qxl-vga.vram64_size_mb", /* 215 */
     );
 
 
@@ -1653,10 +1656,12 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVmwareSvga[] = {
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
     { "vgamem_mb", QEMU_CAPS_QXL_VGAMEM },
+    { "vram64_size_mb", QEMU_CAPS_QXL_VRAM64 },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = {
     { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM },
+    { "vram64_size_mb", QEMU_CAPS_QXL_VGA_VRAM64 },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f51b8e9b5462c42c4ca13ae80941b901cf37e8d4..9aa79aa395933f14110ee8f9bb0c65f6eaaae10e 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -345,6 +345,10 @@ typedef enum {
                                            * deflate-on-oom */
     QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */
     QEMU_CAPS_SPICE_GL, /* -spice gl */
+    QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
+
+    /* 215 */
+    QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_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 34ddd804091893ed4423e746f7481b87e43fc00d..2e452ea1ef44fc4679d463ed5548f99def10023e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps
@@ -112,4 +112,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
index cb8eac9fcd4722b2c8d3b071c04e1de8598486ac..5ad56aa2d4e5ef7f3981484c8cdf9b7ef278fbe5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps
@@ -127,4 +127,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
index 86982f13d44b679ad4e354c10952d38bb96900ed..d0341fdf0d7f56fb5d1a77916410e02857726a77 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps
@@ -128,4 +128,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
index 5401d65743732eea7720a7a0c3bce402f0552592..93ea687e8925eda4f45bf6125407501b4ad0e4e0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps
@@ -137,4 +137,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
index 63536a7c833b72580b7e0fbc7a07ec0677d34cd8..c25b076a0639aa229b219b98ba6c3d5ca60c851c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps
@@ -143,4 +143,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
index 6717a94021370b9525468e5e351dc912e1e19422..30b70e9791aab6a7007fb043000f74743d1ededc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
+++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps
@@ -143,4 +143,6 @@
     <flag name='rtl8139'/>
     <flag name='e1000'/>
     <flag name='virtio-net'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
index 332b85abeb2e62402925687cb42e1072c6a13963..fd2639de7db030464656612f7313f8eb3d3bb3b3 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps
@@ -160,4 +160,6 @@
     <flag name='e1000'/>
     <flag name='virtio-net'/>
     <flag name='vserport-change-event'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
index e411542762918e8cc42c53486ad24720471b9818..4b61fc1e1431f3ec2a9afc7802114c34bd9a279e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps
@@ -171,4 +171,6 @@
     <flag name='ich9-disable-s4'/>
     <flag name='vserport-change-event'/>
     <flag name='virtio-balloon-pci.deflate-on-oom'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
index 931bc4fbcc5832e61f2d0d6f6c4cfd1c6e604005..2061d0ec699b05a55a48ec9a308599bc8763086b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps
@@ -172,4 +172,6 @@
     <flag name='ich9-disable-s4'/>
     <flag name='vserport-change-event'/>
     <flag name='virtio-balloon-pci.deflate-on-oom'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
index 0767b85ab8306ac1f24d3ec3be20b6cef7053944..8374cdab57c38db634b040b1958ba362b52db937 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -175,4 +175,6 @@
     <flag name='vserport-change-event'/>
     <flag name='virtio-balloon-pci.deflate-on-oom'/>
     <flag name='spice-gl'/>
+    <flag name='qxl.vram64_size_mb'/>
+    <flag name='qxl-vga.vram64_size_mb'/>
   </qemuCaps>