From patchwork Mon Mar 26 12:47:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 148736 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E9C1DB6EF1 for ; Mon, 26 Mar 2012 23:48:45 +1100 (EST) Received: from localhost ([::1]:46565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC9Ln-0003ir-Oz for incoming@patchwork.ozlabs.org; Mon, 26 Mar 2012 08:48:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC9Ky-0001OR-ND for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SC9Km-0000vb-Vu for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SC9Km-0000uI-Nl for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:40 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2QClceg006040 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Mar 2012 08:47:38 -0400 Received: from garlic.tlv.redhat.com (spice-ovirt.tlv.redhat.com [10.35.4.71]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2QClXTA018793; Mon, 26 Mar 2012 08:47:37 -0400 From: Alon Levy To: spice-devel@freedesktop.org, qemu-devel@nongnu.org Date: Mon, 26 Mar 2012 14:47:33 +0200 Message-Id: <1332766053-9063-3-git-send-email-alevy@redhat.com> In-Reply-To: <1332766053-9063-1-git-send-email-alevy@redhat.com> References: <1332766053-9063-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kraxel@redhat.com Subject: [Qemu-devel] [PATCH] spice_info: add mouse_mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hmp.c | 2 ++ qapi-schema.json | 7 ++++++- ui/spice-core.c | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/hmp.c b/hmp.c index 9cf2d13..c1224fb 100644 --- a/hmp.c +++ b/hmp.c @@ -350,6 +350,8 @@ 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->has_mouse_mode ? info->mouse_mode : "unknown"); 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..0155dba 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -462,6 +462,11 @@ SpiceInfo *qmp_query_spice(Error **errp) info->tls_port = tls_port; } +#if SPICE_SERVER_VERSION >= 0x000a03 /* 0.10.3 */ + info->has_mouse_mode = true; + info->mouse_mode = g_strdup(spice_server_is_server_mouse(spice_server) ? + "server" : "client"); +#endif /* for compatibility with the original command */ info->has_channels = true; info->channels = qmp_query_spice_channels();