From patchwork Wed Aug 10 07:41:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 109346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4AE4CB7091 for ; Wed, 10 Aug 2011 17:41:46 +1000 (EST) Received: from localhost ([::1]:36579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr3Q6-0000ek-F7 for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 03:41:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42318) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr3Q1-0000eU-Iq for qemu-devel@nongnu.org; Wed, 10 Aug 2011 03:41:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qr3Q0-0000kZ-Kc for qemu-devel@nongnu.org; Wed, 10 Aug 2011 03:41:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30980) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr3Q0-0000kT-Bi for qemu-devel@nongnu.org; Wed, 10 Aug 2011 03:41:36 -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 p7A7fZmJ021876 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Aug 2011 03:41:35 -0400 Received: from bow.redhat.com (vpn-203-215.tlv.redhat.com [10.35.203.215]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7A7fXOp011518; Wed, 10 Aug 2011 03:41:33 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 10 Aug 2011 10:41:00 +0300 Message-Id: <1312962060-7012-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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 v2] ui/spice-core: report version in info spice/query-spice 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 Signed-off-by: Alon Levy --- ui/spice-core.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ui/spice-core.c b/ui/spice-core.c index 3d77c01..4fb1b30 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -372,6 +372,10 @@ 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, " version: %"PRId64".%"PRId64".%"PRId64"\n", + qdict_get_int(server, "version_major"), + qdict_get_int(server, "version_minor"), + qdict_get_int(server, "version_micro")); channels = qdict_get_qlist(server, "channels"); if (qlist_empty(channels)) { @@ -403,6 +407,12 @@ 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")); + qdict_put(server, "version_major", + qint_from_int((SPICE_SERVER_VERSION & 0xff0000) >> 16)); + qdict_put(server, "version_minor", + qint_from_int((SPICE_SERVER_VERSION & 0xff00) >> 8)); + qdict_put(server, "version_micro", + qint_from_int(SPICE_SERVER_VERSION & 0xff)); if (port) { qdict_put(server, "port", qint_from_int(port)); }