* [Qemu-devel] [PATCH 0/2] spice: connection events and monitor commands
@ 2010-11-30 13:11 Gerd Hoffmann
2010-11-30 13:11 ` [Qemu-devel] [PATCH 1/2] spice: connection events Gerd Hoffmann
2010-11-30 13:11 ` [Qemu-devel] [PATCH 2/2] spice: add qmp 'query-spice' and hmp 'info spice' commands Gerd Hoffmann
0 siblings, 2 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2010-11-30 13:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 671 bytes --]
Hi,
This tiny patch series adds spice connection events and a monitor
command for qmü+hmp to query the spice status.
v2 splits the single patch into two to ease review and also adds
documentation for the commands.
please review,
Gerd
Gerd Hoffmann (2):
spice: connection events.
spice: add qmp 'query-spice' and hmp 'info spice' commands.
QMP/qmp-events.txt | 64 ++++++++++++++++
monitor.c | 30 ++++++++
monitor.h | 3 +
qmp-commands.hx | 70 +++++++++++++++++
ui/qemu-spice.h | 3 +
ui/spice-core.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 381 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/2] spice: connection events.
2010-11-30 13:11 [Qemu-devel] [PATCH 0/2] spice: connection events and monitor commands Gerd Hoffmann
@ 2010-11-30 13:11 ` Gerd Hoffmann
2010-12-01 14:07 ` Anthony Liguori
2010-12-01 14:07 ` Anthony Liguori
2010-11-30 13:11 ` [Qemu-devel] [PATCH 2/2] spice: add qmp 'query-spice' and hmp 'info spice' commands Gerd Hoffmann
1 sibling, 2 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2010-11-30 13:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
This patch adds support for connection events to spice. The events are
quite simliar to the vnc events. Unlike vnc spice uses multiple tcp
channels though. qemu will report every single tcp connection (aka
spice channel). If you want track spice sessions only you can filter
for the main channel (channel-type == 1).
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
QMP/qmp-events.txt | 64 ++++++++++++++++++++++++++++++++++++++++++++
monitor.c | 10 +++++++
monitor.h | 3 ++
ui/spice-core.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 152 insertions(+), 0 deletions(-)
diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
index aa20210..0ce5d4e 100644
--- a/QMP/qmp-events.txt
+++ b/QMP/qmp-events.txt
@@ -182,6 +182,70 @@ Example:
"host": "127.0.0.1", "sasl_username": "luiz" } },
"timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
+SPICE_CONNECTED, SPICE_DISCONNECTED
+-----------------------------------
+
+Emitted when a SPICE client connects or disconnects.
+
+Data:
+
+- "server": Server information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+- "client": Client information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+
+Example:
+
+{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},
+ "event": "SPICE_CONNECTED",
+ "data": {
+ "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
+ "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
+}}
+
+
+SPICE_INITIALIZED
+-----------------
+
+Emitted after initial handshake and authentication takes place (if any)
+and the SPICE channel is up'n'running
+
+Data:
+
+- "server": Server information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+ - "auth": authentication method (json-string, optional)
+- "client": Client information (json-object)
+ - "host": IP address (json-string)
+ - "port": port number (json-string)
+ - "family": address family (json-string, "ipv4" or "ipv6")
+ - "connection-id": spice connection id. All channels with the same id
+ belong to the same spice session (json-int)
+ - "channel-type": channel type. "1" is the main control channel, filter for
+ this one if you want track spice sessions only (json-int)
+ - "channel-id": channel id. Usually "0", might be different needed when
+ multiple channels of the same type exist, such as multiple
+ display channels in a multihead setup (json-int)
+ - "tls": whevener the channel is encrypted (json-bool)
+
+Example:
+
+{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
+ "event": "SPICE_INITIALIZED",
+ "data": {"server": {"auth": "spice", "port": "5921",
+ "family": "ipv4", "host": "127.0.0.1"},
+ "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
+ "connection-id": 1804289383, "host": "127.0.0.1",
+ "channel-id": 0, "tls": true}
+}}
+
+
WATCHDOG
--------
diff --git a/monitor.c b/monitor.c
index 8cee35d..7eb8fca 100644
--- a/monitor.c
+++ b/monitor.c
@@ -59,6 +59,7 @@
#ifdef CONFIG_SIMPLE_TRACE
#include "trace.h"
#endif
+#include "ui/qemu-spice.h"
//#define DEBUG
//#define DEBUG_COMPLETION
@@ -459,6 +460,15 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
case QEVENT_WATCHDOG:
event_name = "WATCHDOG";
break;
+ case QEVENT_SPICE_CONNECTED:
+ event_name = "SPICE_CONNECTED";
+ break;
+ case QEVENT_SPICE_INITIALIZED:
+ event_name = "SPICE_INITIALIZED";
+ break;
+ case QEVENT_SPICE_DISCONNECTED:
+ event_name = "SPICE_DISCONNECTED";
+ break;
default:
abort();
break;
diff --git a/monitor.h b/monitor.h
index 2d36bba..4f2d328 100644
--- a/monitor.h
+++ b/monitor.h
@@ -32,6 +32,9 @@ typedef enum MonitorEvent {
QEVENT_BLOCK_IO_ERROR,
QEVENT_RTC_CHANGE,
QEVENT_WATCHDOG,
+ QEVENT_SPICE_CONNECTED,
+ QEVENT_SPICE_INITIALIZED,
+ QEVENT_SPICE_DISCONNECTED,
QEVENT_MAX,
} MonitorEvent;
diff --git a/ui/spice-core.c b/ui/spice-core.c
index b7fa031..93461c6 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -18,16 +18,24 @@
#include <spice.h>
#include <spice-experimental.h>
+#include <netdb.h>
+
#include "qemu-common.h"
#include "qemu-spice.h"
#include "qemu-timer.h"
#include "qemu-queue.h"
#include "qemu-x509.h"
+#include "qemu_socket.h"
+#include "qint.h"
+#include "qbool.h"
+#include "qstring.h"
+#include "qjson.h"
#include "monitor.h"
/* core bits */
static SpiceServer *spice_server;
+static const char *auth = "spice";
int using_spice = 0;
struct SpiceTimer {
@@ -121,6 +129,68 @@ static void watch_remove(SpiceWatch *watch)
qemu_free(watch);
}
+#if SPICE_INTERFACE_CORE_MINOR >= 3
+
+static void add_addr_info(QDict *dict, struct sockaddr *addr, int len)
+{
+ char host[NI_MAXHOST], port[NI_MAXSERV];
+ const char *family;
+
+ getnameinfo(addr, len, host, sizeof(host), port, sizeof(port),
+ NI_NUMERICHOST | NI_NUMERICSERV);
+ family = inet_strfamily(addr->sa_family);
+
+ qdict_put(dict, "host", qstring_from_str(host));
+ qdict_put(dict, "port", qstring_from_str(port));
+ qdict_put(dict, "family", qstring_from_str(family));
+}
+
+static void add_channel_info(QDict *dict, SpiceChannelEventInfo *info)
+{
+ int tls = info->flags & SPICE_CHANNEL_EVENT_FLAG_TLS;
+
+ qdict_put(dict, "connection-id", qint_from_int(info->connection_id));
+ qdict_put(dict, "channel-type", qint_from_int(info->type));
+ qdict_put(dict, "channel-id", qint_from_int(info->id));
+ qdict_put(dict, "tls", qbool_from_int(tls));
+}
+
+static void channel_event(int event, SpiceChannelEventInfo *info)
+{
+ static const int qevent[] = {
+ [ SPICE_CHANNEL_EVENT_CONNECTED ] = QEVENT_SPICE_CONNECTED,
+ [ SPICE_CHANNEL_EVENT_INITIALIZED ] = QEVENT_SPICE_INITIALIZED,
+ [ SPICE_CHANNEL_EVENT_DISCONNECTED ] = QEVENT_SPICE_DISCONNECTED,
+ };
+ QDict *server, *client;
+ QObject *data;
+
+ client = qdict_new();
+ add_addr_info(client, &info->paddr, info->plen);
+
+ server = qdict_new();
+ add_addr_info(server, &info->laddr, info->llen);
+
+ if (event == SPICE_CHANNEL_EVENT_INITIALIZED) {
+ qdict_put(server, "auth", qstring_from_str(auth));
+ add_channel_info(client, info);
+ }
+
+ data = qobject_from_jsonf("{ 'client': %p, 'server': %p }",
+ QOBJECT(client), QOBJECT(server));
+ monitor_protocol_event(qevent[event], data);
+ qobject_decref(data);
+}
+
+#else /* SPICE_INTERFACE_CORE_MINOR >= 3 */
+
+static QList *channel_list_get(void)
+{
+ return NULL;
+}
+
+#endif /* SPICE_INTERFACE_CORE_MINOR >= 3 */
+
static SpiceCoreInterface core_interface = {
.base.type = SPICE_INTERFACE_CORE,
.base.description = "qemu core services",
@@ -135,6 +205,10 @@ static SpiceCoreInterface core_interface = {
.watch_add = watch_add,
.watch_update_mask = watch_update_mask,
.watch_remove = watch_remove,
+
+#if SPICE_INTERFACE_CORE_MINOR >= 3
+ .channel_event = channel_event,
+#endif
};
/* config string parsing */
@@ -316,6 +390,7 @@ void qemu_spice_init(void)
spice_server_set_ticket(spice_server, password, 0, 0, 0);
}
if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) {
+ auth = "none";
spice_server_set_noauth(spice_server);
}
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/2] spice: add qmp 'query-spice' and hmp 'info spice' commands.
2010-11-30 13:11 [Qemu-devel] [PATCH 0/2] spice: connection events and monitor commands Gerd Hoffmann
2010-11-30 13:11 ` [Qemu-devel] [PATCH 1/2] spice: connection events Gerd Hoffmann
@ 2010-11-30 13:11 ` Gerd Hoffmann
1 sibling, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2010-11-30 13:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
The patch adds a 'query-spice' monitor command which returns
informations about the spice server configuration and also a list of
channel connections.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
monitor.c | 20 ++++++++
qmp-commands.hx | 70 ++++++++++++++++++++++++++++
ui/qemu-spice.h | 3 +
ui/spice-core.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 229 insertions(+), 0 deletions(-)
diff --git a/monitor.c b/monitor.c
index 7eb8fca..bfeec0f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2543,6 +2543,16 @@ static const mon_cmd_t info_cmds[] = {
.user_print = do_info_vnc_print,
.mhandler.info_new = do_info_vnc,
},
+#if defined(CONFIG_SPICE)
+ {
+ .name = "spice",
+ .args_type = "",
+ .params = "",
+ .help = "show the spice server status",
+ .user_print = do_info_spice_print,
+ .mhandler.info_new = do_info_spice,
+ },
+#endif
{
.name = "name",
.args_type = "",
@@ -2730,6 +2740,16 @@ static const mon_cmd_t qmp_query_cmds[] = {
.user_print = do_info_vnc_print,
.mhandler.info_new = do_info_vnc,
},
+#if defined(CONFIG_SPICE)
+ {
+ .name = "spice",
+ .args_type = "",
+ .params = "",
+ .help = "show the spice server status",
+ .user_print = do_info_spice_print,
+ .mhandler.info_new = do_info_spice,
+ },
+#endif
{
.name = "name",
.args_type = "",
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 793cf1c..b2f4fe5 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1394,6 +1394,76 @@ Example:
EQMP
SQMP
+query-spice
+-----------
+
+Show SPICE server information.
+
+Return a json-object with server information. Connected clients are returned
+as a json-array of json-objects.
+
+The main json-object contains the following:
+
+- "enabled": true or false (json-bool)
+- "host": server's IP address (json-string)
+- "port": server's port number (json-int, optional)
+- "tls-port": server's port number (json-int, optional)
+- "auth": authentication method (json-string)
+ - Possible values: "none", "spice"
+- "channels": a json-array of all active channels clients
+
+Channels are described by a json-object, each one contain the following:
+
+- "host": client's IP address (json-string)
+- "family": address family (json-string)
+ - Possible values: "ipv4", "ipv6", "unix", "unknown"
+- "port": client's port number (json-string)
+- "connection-id": spice connection id. All channels with the same id
+ belong to the same spice session (json-int)
+- "channel-type": channel type. "1" is the main control channel, filter for
+ this one if you want track spice sessions only (json-int)
+- "channel-id": channel id. Usually "0", might be different needed when
+ multiple channels of the same type exist, such as multiple
+ display channels in a multihead setup (json-int)
+- "tls": whevener the channel is encrypted (json-bool)
+
+Example:
+
+-> { "execute": "query-spice" }
+<- {
+ "return": {
+ "enabled": true,
+ "auth": "spice",
+ "port": 5920,
+ "tls-port": 5921,
+ "host": "0.0.0.0",
+ "channels": [
+ {
+ "port": "54924",
+ "family": "ipv4",
+ "channel-type": 1,
+ "connection-id": 1804289383,
+ "host": "127.0.0.1",
+ "channel-id": 0,
+ "tls": true
+ },
+ {
+ "port": "36710",
+ "family": "ipv4",
+ "channel-type": 4,
+ "connection-id": 1804289383,
+ "host": "127.0.0.1",
+ "channel-id": 0,
+ "tls": false
+ },
+ [ ... more channels follow ... ]
+ ]
+ }
+ }
+
+EQMP
+
+SQMP
query-name
----------
diff --git a/ui/qemu-spice.h b/ui/qemu-spice.h
index 0e3ad9b..8b23ac9 100644
--- a/ui/qemu-spice.h
+++ b/ui/qemu-spice.h
@@ -33,6 +33,9 @@ void qemu_spice_audio_init(void);
void qemu_spice_display_init(DisplayState *ds);
int qemu_spice_add_interface(SpiceBaseInstance *sin);
+void do_info_spice_print(Monitor *mon, const QObject *data);
+void do_info_spice(Monitor *mon, QObject **ret_data);
+
#else /* CONFIG_SPICE */
#define using_spice 0
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 93461c6..d29d203 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -131,6 +131,36 @@ static void watch_remove(SpiceWatch *watch)
#if SPICE_INTERFACE_CORE_MINOR >= 3
+typedef struct ChannelList ChannelList;
+struct ChannelList {
+ SpiceChannelEventInfo *info;
+ QTAILQ_ENTRY(ChannelList) link;
+};
+static QTAILQ_HEAD(, ChannelList) channel_list = QTAILQ_HEAD_INITIALIZER(channel_list);
+
+static void channel_list_add(SpiceChannelEventInfo *info)
+{
+ ChannelList *item;
+
+ item = qemu_mallocz(sizeof(*item));
+ item->info = info;
+ QTAILQ_INSERT_TAIL(&channel_list, item, link);
+}
+
+static void channel_list_del(SpiceChannelEventInfo *info)
+{
+ ChannelList *item;
+
+ QTAILQ_FOREACH(item, &channel_list, link) {
+ if (item->info != info) {
+ continue;
+ }
+ QTAILQ_REMOVE(&channel_list, item, link);
+ qemu_free(item);
+ return;
+ }
+}
+
static void add_addr_info(QDict *dict, struct sockaddr *addr, int len)
{
char host[NI_MAXHOST], port[NI_MAXSERV];
@@ -155,6 +185,22 @@ static void add_channel_info(QDict *dict, SpiceChannelEventInfo *info)
qdict_put(dict, "tls", qbool_from_int(tls));
}
+static QList *channel_list_get(void)
+{
+ ChannelList *item;
+ QList *list;
+ QDict *dict;
+
+ list = qlist_new();
+ QTAILQ_FOREACH(item, &channel_list, link) {
+ dict = qdict_new();
+ add_addr_info(dict, &item->info->paddr, item->info->plen);
+ add_channel_info(dict, item->info);
+ qlist_append(list, dict);
+ }
+ return list;
+}
+
static void channel_event(int event, SpiceChannelEventInfo *info)
{
static const int qevent[] = {
@@ -174,6 +220,10 @@ static void channel_event(int event, SpiceChannelEventInfo *info)
if (event == SPICE_CHANNEL_EVENT_INITIALIZED) {
qdict_put(server, "auth", qstring_from_str(auth));
add_channel_info(client, info);
+ channel_list_add(info);
+ }
+ if (event == SPICE_CHANNEL_EVENT_DISCONNECTED) {
+ channel_list_del(info);
}
data = qobject_from_jsonf("{ 'client': %p, 'server': %p }",
@@ -278,6 +328,92 @@ static const char *wan_compression_names[] = {
/* functions for the rest of qemu */
+static void info_spice_iter(QObject *obj, void *opaque)
+{
+ QDict *client;
+ Monitor *mon = opaque;
+
+ client = qobject_to_qdict(obj);
+ monitor_printf(mon, "Channel:\n");
+ monitor_printf(mon, " address: %s:%s%s\n",
+ qdict_get_str(client, "host"),
+ qdict_get_str(client, "port"),
+ qdict_get_bool(client, "tls") ? " [tls]" : "");
+ monitor_printf(mon, " session: %" PRId64 "\n",
+ qdict_get_int(client, "connection-id"));
+ monitor_printf(mon, " channel: %d:%d\n",
+ (int)qdict_get_int(client, "channel-type"),
+ (int)qdict_get_int(client, "channel-id"));
+}
+
+void do_info_spice_print(Monitor *mon, const QObject *data)
+{
+ QDict *server;
+ QList *channels;
+ const char *host;
+ int port;
+
+ server = qobject_to_qdict(data);
+ if (qdict_get_bool(server, "enabled") == 0) {
+ monitor_printf(mon, "Server: disabled\n");
+ return;
+ }
+
+ monitor_printf(mon, "Server:\n");
+ host = qdict_get_str(server, "host");
+ port = qdict_get_try_int(server, "port", -1);
+ if (port != -1) {
+ monitor_printf(mon, " address: %s:%d\n", host, port);
+ }
+ port = qdict_get_try_int(server, "tls-port", -1);
+ if (port != -1) {
+ monitor_printf(mon, " address: %s:%d [tls]\n", host, port);
+ }
+ monitor_printf(mon, " auth: %s\n", qdict_get_str(server, "auth"));
+
+ channels = qdict_get_qlist(server, "channels");
+ if (qlist_empty(channels)) {
+ monitor_printf(mon, "Channels: none\n");
+ } else {
+ qlist_iter(channels, info_spice_iter, mon);
+ }
+}
+
+void do_info_spice(Monitor *mon, QObject **ret_data)
+{
+ QemuOpts *opts = QTAILQ_FIRST(&qemu_spice_opts.head);
+ QDict *server;
+ QList *clist;
+ const char *addr;
+ int port, tls_port;
+
+ if (!spice_server) {
+ *ret_data = qobject_from_jsonf("{ 'enabled': false }");
+ return;
+ }
+
+ addr = qemu_opt_get(opts, "addr");
+ port = qemu_opt_get_number(opts, "port", 0);
+ tls_port = qemu_opt_get_number(opts, "tls-port", 0);
+ clist = channel_list_get();
+
+ server = qdict_new();
+ 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"));
+ if (port) {
+ qdict_put(server, "port", qint_from_int(port));
+ }
+ if (tls_port) {
+ qdict_put(server, "tls-port", qint_from_int(tls_port));
+ }
+ if (clist) {
+ qdict_put(server, "channels", clist);
+ }
+
+ *ret_data = QOBJECT(server);
+}
+
static int add_channel(const char *name, const char *value, void *opaque)
{
int security = 0;
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] spice: connection events.
2010-11-30 13:11 ` [Qemu-devel] [PATCH 1/2] spice: connection events Gerd Hoffmann
@ 2010-12-01 14:07 ` Anthony Liguori
2010-12-01 14:07 ` Anthony Liguori
1 sibling, 0 replies; 5+ messages in thread
From: Anthony Liguori @ 2010-12-01 14:07 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
On 11/30/2010 07:11 AM, Gerd Hoffmann wrote:
> This patch adds support for connection events to spice. The events are
> quite simliar to the vnc events. Unlike vnc spice uses multiple tcp
> channels though. qemu will report every single tcp connection (aka
> spice channel). If you want track spice sessions only you can filter
> for the main channel (channel-type == 1).
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>
Looks good.
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Regards,
Anthony Liguori
> ---
> QMP/qmp-events.txt | 64 ++++++++++++++++++++++++++++++++++++++++++++
> monitor.c | 10 +++++++
> monitor.h | 3 ++
> ui/spice-core.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 152 insertions(+), 0 deletions(-)
>
> diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
> index aa20210..0ce5d4e 100644
> --- a/QMP/qmp-events.txt
> +++ b/QMP/qmp-events.txt
> @@ -182,6 +182,70 @@ Example:
> "host": "127.0.0.1", "sasl_username": "luiz" } },
> "timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
>
> +SPICE_CONNECTED, SPICE_DISCONNECTED
> +-----------------------------------
> +
> +Emitted when a SPICE client connects or disconnects.
> +
> +Data:
> +
> +- "server": Server information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> +- "client": Client information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> +
> +Example:
> +
> +{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},
> + "event": "SPICE_CONNECTED",
> + "data": {
> + "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
> + "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
> +}}
> +
> +
> +SPICE_INITIALIZED
> +-----------------
> +
> +Emitted after initial handshake and authentication takes place (if any)
> +and the SPICE channel is up'n'running
> +
> +Data:
> +
> +- "server": Server information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> + - "auth": authentication method (json-string, optional)
> +- "client": Client information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> + - "connection-id": spice connection id. All channels with the same id
> + belong to the same spice session (json-int)
> + - "channel-type": channel type. "1" is the main control channel, filter for
> + this one if you want track spice sessions only (json-int)
> + - "channel-id": channel id. Usually "0", might be different needed when
> + multiple channels of the same type exist, such as multiple
> + display channels in a multihead setup (json-int)
> + - "tls": whevener the channel is encrypted (json-bool)
> +
> +Example:
> +
> +{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
> + "event": "SPICE_INITIALIZED",
> + "data": {"server": {"auth": "spice", "port": "5921",
> + "family": "ipv4", "host": "127.0.0.1"},
> + "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
> + "connection-id": 1804289383, "host": "127.0.0.1",
> + "channel-id": 0, "tls": true}
> +}}
> +
> +
> WATCHDOG
> --------
>
> diff --git a/monitor.c b/monitor.c
> index 8cee35d..7eb8fca 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -59,6 +59,7 @@
> #ifdef CONFIG_SIMPLE_TRACE
> #include "trace.h"
> #endif
> +#include "ui/qemu-spice.h"
>
> //#define DEBUG
> //#define DEBUG_COMPLETION
> @@ -459,6 +460,15 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
> case QEVENT_WATCHDOG:
> event_name = "WATCHDOG";
> break;
> + case QEVENT_SPICE_CONNECTED:
> + event_name = "SPICE_CONNECTED";
> + break;
> + case QEVENT_SPICE_INITIALIZED:
> + event_name = "SPICE_INITIALIZED";
> + break;
> + case QEVENT_SPICE_DISCONNECTED:
> + event_name = "SPICE_DISCONNECTED";
> + break;
> default:
> abort();
> break;
> diff --git a/monitor.h b/monitor.h
> index 2d36bba..4f2d328 100644
> --- a/monitor.h
> +++ b/monitor.h
> @@ -32,6 +32,9 @@ typedef enum MonitorEvent {
> QEVENT_BLOCK_IO_ERROR,
> QEVENT_RTC_CHANGE,
> QEVENT_WATCHDOG,
> + QEVENT_SPICE_CONNECTED,
> + QEVENT_SPICE_INITIALIZED,
> + QEVENT_SPICE_DISCONNECTED,
> QEVENT_MAX,
> } MonitorEvent;
>
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index b7fa031..93461c6 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -18,16 +18,24 @@
> #include<spice.h>
> #include<spice-experimental.h>
>
> +#include<netdb.h>
> +
> #include "qemu-common.h"
> #include "qemu-spice.h"
> #include "qemu-timer.h"
> #include "qemu-queue.h"
> #include "qemu-x509.h"
> +#include "qemu_socket.h"
> +#include "qint.h"
> +#include "qbool.h"
> +#include "qstring.h"
> +#include "qjson.h"
> #include "monitor.h"
>
> /* core bits */
>
> static SpiceServer *spice_server;
> +static const char *auth = "spice";
> int using_spice = 0;
>
> struct SpiceTimer {
> @@ -121,6 +129,68 @@ static void watch_remove(SpiceWatch *watch)
> qemu_free(watch);
> }
>
> +#if SPICE_INTERFACE_CORE_MINOR>= 3
> +
> +static void add_addr_info(QDict *dict, struct sockaddr *addr, int len)
> +{
> + char host[NI_MAXHOST], port[NI_MAXSERV];
> + const char *family;
> +
> + getnameinfo(addr, len, host, sizeof(host), port, sizeof(port),
> + NI_NUMERICHOST | NI_NUMERICSERV);
> + family = inet_strfamily(addr->sa_family);
> +
> + qdict_put(dict, "host", qstring_from_str(host));
> + qdict_put(dict, "port", qstring_from_str(port));
> + qdict_put(dict, "family", qstring_from_str(family));
> +}
> +
> +static void add_channel_info(QDict *dict, SpiceChannelEventInfo *info)
> +{
> + int tls = info->flags& SPICE_CHANNEL_EVENT_FLAG_TLS;
> +
> + qdict_put(dict, "connection-id", qint_from_int(info->connection_id));
> + qdict_put(dict, "channel-type", qint_from_int(info->type));
> + qdict_put(dict, "channel-id", qint_from_int(info->id));
> + qdict_put(dict, "tls", qbool_from_int(tls));
> +}
> +
> +static void channel_event(int event, SpiceChannelEventInfo *info)
> +{
> + static const int qevent[] = {
> + [ SPICE_CHANNEL_EVENT_CONNECTED ] = QEVENT_SPICE_CONNECTED,
> + [ SPICE_CHANNEL_EVENT_INITIALIZED ] = QEVENT_SPICE_INITIALIZED,
> + [ SPICE_CHANNEL_EVENT_DISCONNECTED ] = QEVENT_SPICE_DISCONNECTED,
> + };
> + QDict *server, *client;
> + QObject *data;
> +
> + client = qdict_new();
> + add_addr_info(client,&info->paddr, info->plen);
> +
> + server = qdict_new();
> + add_addr_info(server,&info->laddr, info->llen);
> +
> + if (event == SPICE_CHANNEL_EVENT_INITIALIZED) {
> + qdict_put(server, "auth", qstring_from_str(auth));
> + add_channel_info(client, info);
> + }
> +
> + data = qobject_from_jsonf("{ 'client': %p, 'server': %p }",
> + QOBJECT(client), QOBJECT(server));
> + monitor_protocol_event(qevent[event], data);
> + qobject_decref(data);
> +}
> +
> +#else /* SPICE_INTERFACE_CORE_MINOR>= 3 */
> +
> +static QList *channel_list_get(void)
> +{
> + return NULL;
> +}
> +
> +#endif /* SPICE_INTERFACE_CORE_MINOR>= 3 */
> +
> static SpiceCoreInterface core_interface = {
> .base.type = SPICE_INTERFACE_CORE,
> .base.description = "qemu core services",
> @@ -135,6 +205,10 @@ static SpiceCoreInterface core_interface = {
> .watch_add = watch_add,
> .watch_update_mask = watch_update_mask,
> .watch_remove = watch_remove,
> +
> +#if SPICE_INTERFACE_CORE_MINOR>= 3
> + .channel_event = channel_event,
> +#endif
> };
>
> /* config string parsing */
> @@ -316,6 +390,7 @@ void qemu_spice_init(void)
> spice_server_set_ticket(spice_server, password, 0, 0, 0);
> }
> if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) {
> + auth = "none";
> spice_server_set_noauth(spice_server);
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 1/2] spice: connection events.
2010-11-30 13:11 ` [Qemu-devel] [PATCH 1/2] spice: connection events Gerd Hoffmann
2010-12-01 14:07 ` Anthony Liguori
@ 2010-12-01 14:07 ` Anthony Liguori
1 sibling, 0 replies; 5+ messages in thread
From: Anthony Liguori @ 2010-12-01 14:07 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: qemu-devel
On 11/30/2010 07:11 AM, Gerd Hoffmann wrote:
> This patch adds support for connection events to spice. The events are
> quite simliar to the vnc events. Unlike vnc spice uses multiple tcp
> channels though. qemu will report every single tcp connection (aka
> spice channel). If you want track spice sessions only you can filter
> for the main channel (channel-type == 1).
>
> Signed-off-by: Gerd Hoffmann<kraxel@redhat.com>
>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Regards,
Anthony Liguori
> ---
> QMP/qmp-events.txt | 64 ++++++++++++++++++++++++++++++++++++++++++++
> monitor.c | 10 +++++++
> monitor.h | 3 ++
> ui/spice-core.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 152 insertions(+), 0 deletions(-)
>
> diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
> index aa20210..0ce5d4e 100644
> --- a/QMP/qmp-events.txt
> +++ b/QMP/qmp-events.txt
> @@ -182,6 +182,70 @@ Example:
> "host": "127.0.0.1", "sasl_username": "luiz" } },
> "timestamp": { "seconds": 1263475302, "microseconds": 150772 } }
>
> +SPICE_CONNECTED, SPICE_DISCONNECTED
> +-----------------------------------
> +
> +Emitted when a SPICE client connects or disconnects.
> +
> +Data:
> +
> +- "server": Server information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> +- "client": Client information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> +
> +Example:
> +
> +{ "timestamp": {"seconds": 1290688046, "microseconds": 388707},
> + "event": "SPICE_CONNECTED",
> + "data": {
> + "server": { "port": "5920", "family": "ipv4", "host": "127.0.0.1"},
> + "client": {"port": "52873", "family": "ipv4", "host": "127.0.0.1"}
> +}}
> +
> +
> +SPICE_INITIALIZED
> +-----------------
> +
> +Emitted after initial handshake and authentication takes place (if any)
> +and the SPICE channel is up'n'running
> +
> +Data:
> +
> +- "server": Server information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> + - "auth": authentication method (json-string, optional)
> +- "client": Client information (json-object)
> + - "host": IP address (json-string)
> + - "port": port number (json-string)
> + - "family": address family (json-string, "ipv4" or "ipv6")
> + - "connection-id": spice connection id. All channels with the same id
> + belong to the same spice session (json-int)
> + - "channel-type": channel type. "1" is the main control channel, filter for
> + this one if you want track spice sessions only (json-int)
> + - "channel-id": channel id. Usually "0", might be different needed when
> + multiple channels of the same type exist, such as multiple
> + display channels in a multihead setup (json-int)
> + - "tls": whevener the channel is encrypted (json-bool)
> +
> +Example:
> +
> +{ "timestamp": {"seconds": 1290688046, "microseconds": 417172},
> + "event": "SPICE_INITIALIZED",
> + "data": {"server": {"auth": "spice", "port": "5921",
> + "family": "ipv4", "host": "127.0.0.1"},
> + "client": {"port": "49004", "family": "ipv4", "channel-type": 3,
> + "connection-id": 1804289383, "host": "127.0.0.1",
> + "channel-id": 0, "tls": true}
> +}}
> +
> +
> WATCHDOG
> --------
>
> diff --git a/monitor.c b/monitor.c
> index 8cee35d..7eb8fca 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -59,6 +59,7 @@
> #ifdef CONFIG_SIMPLE_TRACE
> #include "trace.h"
> #endif
> +#include "ui/qemu-spice.h"
>
> //#define DEBUG
> //#define DEBUG_COMPLETION
> @@ -459,6 +460,15 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
> case QEVENT_WATCHDOG:
> event_name = "WATCHDOG";
> break;
> + case QEVENT_SPICE_CONNECTED:
> + event_name = "SPICE_CONNECTED";
> + break;
> + case QEVENT_SPICE_INITIALIZED:
> + event_name = "SPICE_INITIALIZED";
> + break;
> + case QEVENT_SPICE_DISCONNECTED:
> + event_name = "SPICE_DISCONNECTED";
> + break;
> default:
> abort();
> break;
> diff --git a/monitor.h b/monitor.h
> index 2d36bba..4f2d328 100644
> --- a/monitor.h
> +++ b/monitor.h
> @@ -32,6 +32,9 @@ typedef enum MonitorEvent {
> QEVENT_BLOCK_IO_ERROR,
> QEVENT_RTC_CHANGE,
> QEVENT_WATCHDOG,
> + QEVENT_SPICE_CONNECTED,
> + QEVENT_SPICE_INITIALIZED,
> + QEVENT_SPICE_DISCONNECTED,
> QEVENT_MAX,
> } MonitorEvent;
>
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index b7fa031..93461c6 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -18,16 +18,24 @@
> #include<spice.h>
> #include<spice-experimental.h>
>
> +#include<netdb.h>
> +
> #include "qemu-common.h"
> #include "qemu-spice.h"
> #include "qemu-timer.h"
> #include "qemu-queue.h"
> #include "qemu-x509.h"
> +#include "qemu_socket.h"
> +#include "qint.h"
> +#include "qbool.h"
> +#include "qstring.h"
> +#include "qjson.h"
> #include "monitor.h"
>
> /* core bits */
>
> static SpiceServer *spice_server;
> +static const char *auth = "spice";
> int using_spice = 0;
>
> struct SpiceTimer {
> @@ -121,6 +129,68 @@ static void watch_remove(SpiceWatch *watch)
> qemu_free(watch);
> }
>
> +#if SPICE_INTERFACE_CORE_MINOR>= 3
> +
> +static void add_addr_info(QDict *dict, struct sockaddr *addr, int len)
> +{
> + char host[NI_MAXHOST], port[NI_MAXSERV];
> + const char *family;
> +
> + getnameinfo(addr, len, host, sizeof(host), port, sizeof(port),
> + NI_NUMERICHOST | NI_NUMERICSERV);
> + family = inet_strfamily(addr->sa_family);
> +
> + qdict_put(dict, "host", qstring_from_str(host));
> + qdict_put(dict, "port", qstring_from_str(port));
> + qdict_put(dict, "family", qstring_from_str(family));
> +}
> +
> +static void add_channel_info(QDict *dict, SpiceChannelEventInfo *info)
> +{
> + int tls = info->flags& SPICE_CHANNEL_EVENT_FLAG_TLS;
> +
> + qdict_put(dict, "connection-id", qint_from_int(info->connection_id));
> + qdict_put(dict, "channel-type", qint_from_int(info->type));
> + qdict_put(dict, "channel-id", qint_from_int(info->id));
> + qdict_put(dict, "tls", qbool_from_int(tls));
> +}
> +
> +static void channel_event(int event, SpiceChannelEventInfo *info)
> +{
> + static const int qevent[] = {
> + [ SPICE_CHANNEL_EVENT_CONNECTED ] = QEVENT_SPICE_CONNECTED,
> + [ SPICE_CHANNEL_EVENT_INITIALIZED ] = QEVENT_SPICE_INITIALIZED,
> + [ SPICE_CHANNEL_EVENT_DISCONNECTED ] = QEVENT_SPICE_DISCONNECTED,
> + };
> + QDict *server, *client;
> + QObject *data;
> +
> + client = qdict_new();
> + add_addr_info(client,&info->paddr, info->plen);
> +
> + server = qdict_new();
> + add_addr_info(server,&info->laddr, info->llen);
> +
> + if (event == SPICE_CHANNEL_EVENT_INITIALIZED) {
> + qdict_put(server, "auth", qstring_from_str(auth));
> + add_channel_info(client, info);
> + }
> +
> + data = qobject_from_jsonf("{ 'client': %p, 'server': %p }",
> + QOBJECT(client), QOBJECT(server));
> + monitor_protocol_event(qevent[event], data);
> + qobject_decref(data);
> +}
> +
> +#else /* SPICE_INTERFACE_CORE_MINOR>= 3 */
> +
> +static QList *channel_list_get(void)
> +{
> + return NULL;
> +}
> +
> +#endif /* SPICE_INTERFACE_CORE_MINOR>= 3 */
> +
> static SpiceCoreInterface core_interface = {
> .base.type = SPICE_INTERFACE_CORE,
> .base.description = "qemu core services",
> @@ -135,6 +205,10 @@ static SpiceCoreInterface core_interface = {
> .watch_add = watch_add,
> .watch_update_mask = watch_update_mask,
> .watch_remove = watch_remove,
> +
> +#if SPICE_INTERFACE_CORE_MINOR>= 3
> + .channel_event = channel_event,
> +#endif
> };
>
> /* config string parsing */
> @@ -316,6 +390,7 @@ void qemu_spice_init(void)
> spice_server_set_ticket(spice_server, password, 0, 0, 0);
> }
> if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) {
> + auth = "none";
> spice_server_set_noauth(spice_server);
> }
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-01 14:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-30 13:11 [Qemu-devel] [PATCH 0/2] spice: connection events and monitor commands Gerd Hoffmann
2010-11-30 13:11 ` [Qemu-devel] [PATCH 1/2] spice: connection events Gerd Hoffmann
2010-12-01 14:07 ` Anthony Liguori
2010-12-01 14:07 ` Anthony Liguori
2010-11-30 13:11 ` [Qemu-devel] [PATCH 2/2] spice: add qmp 'query-spice' and hmp 'info spice' commands Gerd Hoffmann
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).