]> git.proxmox.com Git - pve-qemu-kvm.git/blob - debian/patches/pve/0009-qapi-modify-spice-query.patch
389a2f4b818bb99c927957546d21949a799dc124
[pve-qemu-kvm.git] / debian / patches / pve / 0009-qapi-modify-spice-query.patch
1 From c51f39a5741210b7df2ac212a8ced14ef950d415 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 14:32:11 +0100
4 Subject: [PATCH 09/47] qapi: modify spice query
5
6 Provide 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
12 diff --git a/qapi-schema.json b/qapi-schema.json
13 index 2c40928..ca534cc 100644
14 --- a/qapi-schema.json
15 +++ b/qapi-schema.json
16 @@ -1841,11 +1841,14 @@
17 #
18 # @channels: a list of @SpiceChannel for each active spice channel
19 #
20 +# @ticket: The last ticket set with set_password
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 ##
31 diff --git a/ui/spice-core.c b/ui/spice-core.c
32 index 804abc5..4a41731 100644
33 --- a/ui/spice-core.c
34 +++ b/ui/spice-core.c
35 @@ -552,6 +552,11 @@ SpiceInfo *qmp_query_spice(Error **errp)
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 --
48 2.1.4
49