diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-24 13:06:13 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-24 13:06:13 +0100 |
| commit | 089a39486f2c47994c6c0d34ac7abf34baf40d9d (patch) | |
| tree | 07bf9220989162df8d29b99568d13ce6d5261822 /hmp.c | |
| parent | 27acb9dd2407f41550e453b85aa5ebf1bd618b79 (diff) | |
| parent | d622cb5879ca8006d5482158e4e3b272a068c301 (diff) | |
| download | focaccia-qemu-089a39486f2c47994c6c0d34ac7abf34baf40d9d.tar.gz focaccia-qemu-089a39486f2c47994c6c0d34ac7abf34baf40d9d.zip | |
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
* remotes/qmp-unstable/queue/qmp: (43 commits) monitor: protect event emission monitor: protect outbuf and mux_out with mutex qemu-char: make writes thread-safe qemu-char: move pty_chr_update_read_handler around qemu-char: do not call chr_write directly qemu-char: introduce qemu_chr_alloc qapi event: clean up qapi event: convert QUORUM events qapi event: convert GUEST_PANICKED qapi event: convert BALLOON_CHANGE qmp: convert ACPI_DEVICE_OST event qapi event: convert SPICE events qapi event: convert VNC events qapi event: convert NIC_RX_FILTER_CHANGED qapi event: convert other BLOCK_JOB events qapi event: convert BLOCK_IMAGE_CORRUPTED qapi event: convert BLOCK_IO_ERROR and BLOCK_JOB_ERROR qapi event: convert DEVICE_TRAY_MOVED qapi event: convert DEVICE_DELETED qapi event: convert WATCHDOG ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hmp.c')
| -rw-r--r-- | hmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hmp.c b/hmp.c index e183a79b8a..dc3d2795d2 100644 --- a/hmp.c +++ b/hmp.c @@ -465,7 +465,8 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict) for (client = info->clients; client; client = client->next) { monitor_printf(mon, "Client:\n"); monitor_printf(mon, " address: %s:%s\n", - client->value->host, client->value->service); + client->value->base->host, + client->value->base->service); monitor_printf(mon, " x509_dname: %s\n", client->value->x509_dname ? client->value->x509_dname : "none"); @@ -513,7 +514,7 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict) for (chan = info->channels; chan; chan = chan->next) { monitor_printf(mon, "Channel:\n"); monitor_printf(mon, " address: %s:%s%s\n", - chan->value->host, chan->value->port, + chan->value->base->host, chan->value->base->port, chan->value->tls ? " [tls]" : ""); monitor_printf(mon, " session: %" PRId64 "\n", chan->value->connection_id); |