diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:37:23 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:37:23 -0500 |
| commit | dfebfcf02f74ed47b61841037d7eda1baffb4d6e (patch) | |
| tree | 15ce64dc8a2bc0ee84a85c1d3f6c5dfe8bae3681 /monitor.c | |
| parent | 49f54371f22e3e95124e8115050cea29fadde606 (diff) | |
| parent | ad1be89948f88e89708b04ccd782456ccec3a6f0 (diff) | |
| download | focaccia-qemu-dfebfcf02f74ed47b61841037d7eda1baffb4d6e.tar.gz focaccia-qemu-dfebfcf02f74ed47b61841037d7eda1baffb4d6e.zip | |
Merge remote-tracking branch 'spice/spice.v50' into staging
* spice/spice.v50: spice: fix broken initialization hw/qxl.c: Fix compilation failures on 32 bit hosts qxl/qxl_render.c: add trace events qxl: switch qxl.c to trace-events qxl: init_pipe_signaling: exit on failure monitor: fix client_migrate_info error handling spice: set spice uuid and name
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/monitor.c b/monitor.c index d57e7bf61d..8f460317ee 100644 --- a/monitor.c +++ b/monitor.c @@ -880,6 +880,11 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, return -1; } + if (port == -1 && tls_port == -1) { + qerror_report(QERR_MISSING_PARAMETER, "port/tls-port"); + return -1; + } + ret = qemu_spice_migrate_info(hostname, port, tls_port, subject, cb, opaque); if (ret != 0) { |