diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 20:00:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-27 20:00:57 +0100 |
| commit | 3d27b09cf6f62ec61c1330d0a811811a91e7514d (patch) | |
| tree | 5c67fa76257090a0d5cb00a607e9eeb382a3679c /monitor.c | |
| parent | 3f9d69ba12da6f2874631f6e426a7ef148ba4c82 (diff) | |
| parent | 700cd855def54c2a9f2b6a016dcebf75fe19c238 (diff) | |
| download | qemu-3d27b09cf6f62ec61c1330d0a811811a91e7514d.zip qemu-3d27b09cf6f62ec61c1330d0a811811a91e7514d.tar.gz qemu-3d27b09cf6f62ec61c1330d0a811811a91e7514d.tar.bz2 | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150427-1' into staging
spice: misc fixes.
# gpg: Signature made Mon Apr 27 12:03:16 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/spice/tags/pull-spice-20150427-1:
spice: learn to hide cursor
spice: set pointer position on hotspot
spice: fix mouse cursor position
spice: fix simple display on bigendian hosts
monitor: Make client_migrate_info synchronous
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1086,7 +1086,7 @@ static void hmp_info_trace_events(Monitor *mon, const QDict *qdict) } static int client_migrate_info(Monitor *mon, const QDict *qdict, - MonitorCompletion cb, void *opaque) + QObject **ret_data) { const char *protocol = qdict_get_str(qdict, "protocol"); const char *hostname = qdict_get_str(qdict, "hostname"); @@ -1108,8 +1108,7 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, return -1; } - ret = qemu_spice_migrate_info(hostname, port, tls_port, subject, - cb, opaque); + ret = qemu_spice_migrate_info(hostname, port, tls_port, subject); if (ret != 0) { qerror_report(QERR_UNDEFINED_ERROR); return -1; |