diff options
| author | Alon Levy <alevy@redhat.com> | 2011-08-10 19:31:46 +0300 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2011-08-10 18:52:06 +0200 |
| commit | 8df0c7e8fc03882230c31315f63108c049f72dac (patch) | |
| tree | 9c24f1360687cd551d504081814d3ec06d6edc1a | |
| parent | c5f3dabba974aeea36726aaf5a7a5509ee705370 (diff) | |
ui/spice-core: report compiled-version in info spice/query-spice
Signed-off-by: Alon Levy <alevy@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | 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 3d77c01448..8bb62eaa01 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)); } |