update patches for v4.0.0

[pve-qemu.git] / debian / patches / pve / 0016-PVE-qapi-modify-spice-query.patch

diff --git a/debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch b/debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch
new file mode 100644 (file)
index 0000000..1d7b754
--- /dev/null
+++ b/debian/patches/pve/0016-PVE-qapi-modify-spice-query.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Wed, 9 Dec 2015 14:32:11 +0100
+Subject: [PATCH] PVE: qapi: modify spice query
+
+Provide the last ticket in the SpiceInfo struct optionally.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ qapi/ui.json    | 3 +++
+ ui/spice-core.c | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/qapi/ui.json b/qapi/ui.json
+index 59e412139a..bcd781a1b9 100644
+--- a/qapi/ui.json
++++ b/qapi/ui.json
+@@ -211,11 +211,14 @@
+ #
+ # @channels: a list of @SpiceChannel for each active spice channel
+ #
++# @ticket: The last ticket set with set_password
++#
+ # Since: 0.14.0
+ ##
+ { 'struct': 'SpiceInfo',
+   'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',
+            '*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
++           '*ticket': 'str',
+            'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']},
+   'if': 'defined(CONFIG_SPICE)' }
+ 
+diff --git a/ui/spice-core.c b/ui/spice-core.c
+index 5593dfcb06..bd80c18210 100644
+--- a/ui/spice-core.c
++++ b/ui/spice-core.c
+@@ -538,6 +538,11 @@ SpiceInfo *qmp_query_spice(Error **errp)
+     micro = SPICE_SERVER_VERSION & 0xff;
+     info->compiled_version = g_strdup_printf("%d.%d.%d", major, minor, micro);
+ 
++    if (auth_passwd) {
++        info->has_ticket = true;
++        info->ticket =  g_strdup(auth_passwd);
++    }
++
+     if (port) {
+         info->has_port = true;
+         info->port = port;
+-- 
+2.20.1
+