From 37b746336e6de7c5b0f6a3883c19b2e3b1eda3e7 Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Tue, 1 Mar 2016 13:46:37 +0100
Subject: [PATCH] qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/qemu/qemu_capabilities.c                  | 5 +++++
 src/qemu/qemu_capabilities.h                  | 4 ++++
 tests/qemucapabilitiesdata/caps_1.2.2-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_1.3.1-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_1.4.2-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_1.5.3-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_1.6.0-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 ++
 tests/qemucapabilitiesdata/caps_2.1.1-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_2.4.0-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_2.5.0-1.caps  | 2 ++
 tests/qemucapabilitiesdata/caps_2.6.0-1.caps  | 2 ++
 12 files changed, 29 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 6762e4c6b4..355b76e1f8 100644
--- 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 f51b8e9b54..9aa79aa395 100644
--- 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 34ddd80409..2e452ea1ef 100644
--- 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 cb8eac9fcd..5ad56aa2d4 100644
--- 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 86982f13d4..d0341fdf0d 100644
--- 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 5401d65743..93ea687e89 100644
--- 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 63536a7c83..c25b076a06 100644
--- 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 6717a94021..30b70e9791 100644
--- 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 332b85abeb..fd2639de7d 100644
--- 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 e411542762..4b61fc1e14 100644
--- 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 931bc4fbcc..2061d0ec69 100644
--- 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 0767b85ab8..8374cdab57 100644
--- 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>