From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller 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 --- 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 c95bbd6c77..ccba92a6ed 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;