From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCBZ7-0006cS-UY for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:10:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCBZ2-0006SV-UY for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:10:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCBZ2-0006Rp-Lx for qemu-devel@nongnu.org; Mon, 26 Mar 2012 11:10:32 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2QFAUAX032004 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Mar 2012 11:10:31 -0400 From: Alon Levy Date: Mon, 26 Mar 2012 16:15:32 +0200 Message-Id: <1332771332-14090-1-git-send-email-alevy@redhat.com> In-Reply-To: <1332766053-9063-3-git-send-email-alevy@redhat.com> References: <1332766053-9063-3-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH v2] spice_info: add mouse_mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kraxel@redhat.com Add mouse_mode, either server or mouse, to qmp and hmp commands, based on spice_server_is_server_mouse added in spice-server 0.10.3. Signed-off-by: Alon Levy --- v1->v2: report mouse mode "unknown" for qmp too (Gerd Hoffman request) hmp.c | 1 + qapi-schema.json | 7 ++++++- ui/spice-core.c | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/hmp.c b/hmp.c index 9cf2d13..8837dd0 100644 --- a/hmp.c +++ b/hmp.c @@ -350,6 +350,7 @@ void hmp_info_spice(Monitor *mon) } monitor_printf(mon, " auth: %s\n", info->auth); monitor_printf(mon, " compiled: %s\n", info->compiled_version); + monitor_printf(mon, " mouse-mode: %s\n", info->mouse_mode); if (!info->has_channels || info->channels == NULL) { monitor_printf(mon, "Channels: none\n"); diff --git a/qapi-schema.json b/qapi-schema.json index 0d11d6e..72c0080 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -654,6 +654,11 @@ # 'spice' uses SASL or direct TLS authentication, depending on command # line options # +# @mouse-mode: #optional current server mouse mode if spice server is new +# enough and exposes this information. +# 'client' if client side +# 'server' if server side +# # @channels: a list of @SpiceChannel for each active spice channel # # Since: 0.14.0 @@ -661,7 +666,7 @@ { 'type': 'SpiceInfo', 'data': {'enabled': 'bool', '*host': 'str', '*port': 'int', '*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str', - '*channels': ['SpiceChannel']} } + '*mouse-mode': 'str', '*channels': ['SpiceChannel']} } ## # @query-spice diff --git a/ui/spice-core.c b/ui/spice-core.c index a468524..1579187 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -462,6 +462,13 @@ SpiceInfo *qmp_query_spice(Error **errp) info->tls_port = tls_port; } + info->has_mouse_mode = true; +#if SPICE_SERVER_VERSION >= 0x000a03 /* 0.10.3 */ + info->mouse_mode = g_strdup(spice_server_is_server_mouse(spice_server) ? + "server" : "client"); +#else + info->mouse_mode = g_strdup("unknown"); +#endif /* for compatibility with the original command */ info->has_channels = true; info->channels = qmp_query_spice_channels(); -- 1.7.9.3