Patchwork [v5] ui/spice-core: report compiled-version in info spice/query-spice

login
register
mail settings
Submitter Alon Levy
Date Aug. 10, 2011, 3:23 p.m.
Message ID <1312989789-976-1-git-send-email-alevy@redhat.com>
Download mbox | patch
Permalink /patch/109387/
State New
Headers show

Comments

Alon Levy - Aug. 10, 2011, 3:23 p.m.
Signed-off-by: Alon Levy <alevy@redhat.com>
---
 ui/spice-core.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
Gerd Hoffmann - Aug. 10, 2011, 3:29 p.m.
> +    char version_string[20]; // 12 = |255.255.255\0| is the max

checkpatch reports:

ERROR: do not use C99 // comments
#19: FILE: ui/spice-core.c:393:
+    char version_string[20]; // 12 = |255.255.255\0| is the max

cheers,
   Gerd

Patch

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 3d77c01..768378e 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));
     }