From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrAeJ-0006Ba-U2 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 11:24:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrAeF-0008Mm-8M for qemu-devel@nongnu.org; Wed, 10 Aug 2011 11:24:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22039) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrAeD-0008Mc-JK for qemu-devel@nongnu.org; Wed, 10 Aug 2011 11:24:47 -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 p7AFOixD031187 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Aug 2011 11:24:45 -0400 Date: Wed, 10 Aug 2011 18:24:07 +0300 From: Alon Levy Message-ID: <20110810152407.GJ5637@bow.redhat.com> References: <1312989676-32743-1-git-send-email-alevy@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1312989676-32743-1-git-send-email-alevy@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4] 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: kraxel@redhat.com On Wed, Aug 10, 2011 at 06:21:16PM +0300, Alon Levy wrote: > Signed-off-by: Alon Levy NACK, next version uses snprintf. > --- > 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..b9d1cd4 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")); > + sprintf(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.6 > >