From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Alon Levy <alevy@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 3/3] ui/spice-core: report compiled-version in info spice/query-spice
Date: Thu, 11 Aug 2011 09:13:37 +0200 [thread overview]
Message-ID: <1313046817-5563-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1313046817-5563-1-git-send-email-kraxel@redhat.com>
From: Alon Levy <alevy@redhat.com>
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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
next prev parent reply other threads:[~2011-08-11 7:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-11 7:13 [Qemu-devel] [PULL] spice patch queue Gerd Hoffmann
2011-08-11 7:13 ` [Qemu-devel] [PATCH 1/3] qxl: allowing the command rings to be not empty when spice worker is stopped RHBZ #728984 Gerd Hoffmann
2011-08-11 7:13 ` [Qemu-devel] [PATCH 2/3] qxl: unbreak after memory API conversion Gerd Hoffmann
2011-08-11 7:13 ` Gerd Hoffmann [this message]
2011-08-12 7:00 ` [Qemu-devel] [PULL] spice patch queue Michael Tokarev
2011-08-12 7:56 ` Gerd Hoffmann
2011-08-12 13:04 ` Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313046817-5563-4-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=alevy@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).