summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorYonit Halperin <yhalperi@redhat.com>2011-10-17 10:03:18 +0200
committerGerd Hoffmann <kraxel@redhat.com>2011-10-25 14:00:53 +0200
commitedc5cb1a52b2847201acf78b0fba67ab3c2464d5 (patch)
tree5998b53e42d55086f130c0e3a7ef1e86f4eea57b /monitor.c
parentafe2df69cf9305b195d96afc545d3fefc0fb5f5d (diff)
downloadqemu-edc5cb1a52b2847201acf78b0fba67ab3c2464d5.tar.gz
qemu-edc5cb1a52b2847201acf78b0fba67ab3c2464d5.tar.bz2
qemu-edc5cb1a52b2847201acf78b0fba67ab3c2464d5.zip
spice: turn client_migrate_info to async
RHBZ 737921 Spice client is required to connect to the migration target before/as migration starts. Since after migration starts, the target qemu is blocked and cannot accept new spice client we trigger the connection to the target upon client_migrate_info command. client_migrate_info completion cb will be called after spice client has been connected to the target (or a timeout). See following patches and spice patches. Signed-off-by: Yonit Halperin <yhalperi@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index ffda0feb84..13b0fa5738 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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;