60ae3775bf
No major semantic changes, mostly just deprecations and changed function signatures. Drop the extra/ patches, as they have been applied upstream. The added extra/ patch was accepted upstream[0] but has not been picked up for 5.1. It is required for non-4M aligned backups to work with PBS. [0] https://lists.gnu.org/archive/html/qemu-devel/2020-08/msg01671.html Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
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 9d6721037f..af87b18db9 100644
|
|
--- a/qapi/ui.json
|
|
+++ b/qapi/ui.json
|
|
@@ -214,11 +214,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 ca04965ead..243466c13d 100644
|
|
--- a/ui/spice-core.c
|
|
+++ b/ui/spice-core.c
|
|
@@ -539,6 +539,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;
|