]> git.proxmox.com Git - pve-qemu-kvm.git/blame - debian/patches/pve/0009-qapi-modify-spice-query.patch
bump version to 2.9.0-1~rc2+5
[pve-qemu-kvm.git] / debian / patches / pve / 0009-qapi-modify-spice-query.patch
CommitLineData
1a91ab45 1From c51f39a5741210b7df2ac212a8ced14ef950d415 Mon Sep 17 00:00:00 2001
ca0fe5f5
WB
2From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3Date: Wed, 9 Dec 2015 14:32:11 +0100
adeb0c7a 4Subject: [PATCH 09/48] qapi: modify spice query
ca0fe5f5
WB
5
6Provide the last ticket in the SpiceInfo struct optionally.
7---
8 qapi-schema.json | 3 +++
9 ui/spice-core.c | 5 +++++
10 2 files changed, 8 insertions(+)
11
12diff --git a/qapi-schema.json b/qapi-schema.json
1a91ab45 13index 2c40928..ca534cc 100644
ca0fe5f5
WB
14--- a/qapi-schema.json
15+++ b/qapi-schema.json
1a91ab45 16@@ -1841,11 +1841,14 @@
ca0fe5f5
WB
17 #
18 # @channels: a list of @SpiceChannel for each active spice channel
19 #
1a91ab45 20+# @ticket: The last ticket set with set_password
ca0fe5f5
WB
21+#
22 # Since: 0.14.0
23 ##
24 { 'struct': 'SpiceInfo',
25 'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port': 'int',
26 '*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
27+ '*ticket': 'str',
28 'mouse-mode': 'SpiceQueryMouseMode', '*channels': ['SpiceChannel']} }
29
30 ##
31diff --git a/ui/spice-core.c b/ui/spice-core.c
1a91ab45 32index 804abc5..4a41731 100644
ca0fe5f5
WB
33--- a/ui/spice-core.c
34+++ b/ui/spice-core.c
1a91ab45 35@@ -552,6 +552,11 @@ SpiceInfo *qmp_query_spice(Error **errp)
ca0fe5f5
WB
36 micro = SPICE_SERVER_VERSION & 0xff;
37 info->compiled_version = g_strdup_printf("%d.%d.%d", major, minor, micro);
38
39+ if (auth_passwd) {
40+ info->has_ticket = true;
41+ info->ticket = g_strdup(auth_passwd);
42+ }
43+
44 if (port) {
45 info->has_port = true;
46 info->port = port;
47--
482.1.4
49