update submodule and patches to 7.1.0

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

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Mon, 6 Apr 2020 12:16:45 +0200
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 cf58ab4283..0be2388941 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -310,11 +310,14 @@
 #
 # @channels: a list of @SpiceChannel for each active spice channel
 #
+# @ticket: The last ticket set with set_password
+#
 # Since: 0.14
 ##
 { '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': 'CONFIG_SPICE' }
 
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 37774f1c0a..367f77f2b4 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -534,6 +534,11 @@ static SpiceInfo *qmp_query_spice_real(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;