[libvirt] [PATCH 1/3] qemu_capabilities: introduce QEMU_CAPS_QXL(_VGA)_VRAM64
Pavel Hrdina
phrdina at redhat.com
Mon Feb 22 13:34:12 UTC 2016
Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
src/qemu/qemu_capabilities.c | 4 ++++
src/qemu/qemu_capabilities.h | 2 ++
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, 26 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2b953ea..28d6b7a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -315,6 +315,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"vserport-change-event", /* 210 */
"virtio-balloon-pci.deflate-on-oom",
"mptsas1068",
+ "qxl.vram64_size_mb",
+ "qxl-vga.vram64_size_mb",
);
@@ -1652,10 +1654,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 b73c529..5cb2e63 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -344,6 +344,8 @@ typedef enum {
QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}.
* deflate-on-oom */
QEMU_CAPS_SCSI_MPTSAS1068, /* -device mptsas1068 */
+ QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
+ 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 34ddd80..2e452ea 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 cb8eac9..5ad56aa 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 86982f1..d0341fd 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 5401d65..93ea687 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 63536a7..c25b076 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 6717a94..30b70e9 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 332b85a..fd2639d 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 e411542..4b61fc1 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 931bc4f..2061d0e 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 f32d5aa..8d78b82 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-1.caps
@@ -174,4 +174,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>
--
2.7.1
More information about the libvir-list
mailing list