From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrPSX-0000gh-Tu for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:13:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrPSX-0000Qg-20 for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:13:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrPSW-0000QQ-PP for qemu-devel@nongnu.org; Thu, 11 Aug 2011 03:13:41 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7B7DeId020868 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 11 Aug 2011 03:13:40 -0400 From: Gerd Hoffmann Date: Thu, 11 Aug 2011 09:13:37 +0200 Message-Id: <1313046817-5563-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1313046817-5563-1-git-send-email-kraxel@redhat.com> References: <1313046817-5563-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] ui/spice-core: report compiled-version in info spice/query-spice List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alon Levy , Gerd Hoffmann From: Alon Levy Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index 3d77c01..8bb62ea 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -372,6 +372,8 @@ void do_info_spice_print(Monitor *mon, const QObject *data) monitor_printf(mon, " address: %s:%d [tls]\n", host, port); } monitor_printf(mon, " auth: %s\n", qdict_get_str(server, "auth")); + monitor_printf(mon, " compiled: %s\n", + qdict_get_str(server, "compiled-version")); channels = qdict_get_qlist(server, "channels"); if (qlist_empty(channels)) { @@ -388,6 +390,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data) QList *clist; const char *addr; int port, tls_port; + char version_string[20]; /* 12 = |255.255.255\0| is the max */ if (!spice_server) { *ret_data = qobject_from_jsonf("{ 'enabled': false }"); @@ -403,6 +406,11 @@ void do_info_spice(Monitor *mon, QObject **ret_data) qdict_put(server, "enabled", qbool_from_int(true)); qdict_put(server, "auth", qstring_from_str(auth)); qdict_put(server, "host", qstring_from_str(addr ? addr : "0.0.0.0")); + snprintf(version_string, sizeof(version_string), "%d.%d.%d", + (SPICE_SERVER_VERSION & 0xff0000) >> 16, + (SPICE_SERVER_VERSION & 0xff00) >> 8, + SPICE_SERVER_VERSION & 0xff); + qdict_put(server, "compiled-version", qstring_from_str(version_string)); if (port) { qdict_put(server, "port", qint_from_int(port)); } -- 1.7.1