diff options
author | Anthony Liguori | 2011-10-31 16:12:14 +0100 |
---|---|---|
committer | Anthony Liguori | 2011-10-31 16:12:14 +0100 |
commit | eca968d0d4250fe95abbc7ea99f887142f44b4e0 (patch) | |
tree | 0aa5371719a5b7ed6c9af7096c3653cb49387596 /monitor.c | |
parent | hw/vexpress.c, hw/realview.c: Add PL041 to VExpress, Realview boards (diff) | |
parent | spice: fix file handle cleanup (diff) | |
download | qemu-eca968d0d4250fe95abbc7ea99f887142f44b4e0.tar.gz qemu-eca968d0d4250fe95abbc7ea99f887142f44b4e0.tar.xz qemu-eca968d0d4250fe95abbc7ea99f887142f44b4e0.zip |
Merge remote-tracking branch 'spice/spice.v45' into staging
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1153,7 +1153,8 @@ static int add_graphics_client(Monitor *mon, const QDict *qdict, QObject **ret_d return -1; } -static int client_migrate_info(Monitor *mon, const QDict *qdict, QObject **ret_data) +static int client_migrate_info(Monitor *mon, const QDict *qdict, + MonitorCompletion cb, void *opaque) { const char *protocol = qdict_get_str(qdict, "protocol"); const char *hostname = qdict_get_str(qdict, "hostname"); @@ -1168,7 +1169,8 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict, QObject **ret_d return -1; } - ret = qemu_spice_migrate_info(hostname, port, tls_port, subject); + ret = qemu_spice_migrate_info(hostname, port, tls_port, subject, + cb, opaque); if (ret != 0) { qerror_report(QERR_UNDEFINED_ERROR); return -1; |