@@ -98,7 +98,7 @@ static void exec_accept_incoming_migration(void *opaque)
QEMUFile *f = opaque;
qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
- process_incoming_migration(f);
+ process_incoming_migration(f, qemu_stdio_fd(f));
}
int exec_start_incoming_migration(const char *command)
@@ -104,7 +104,7 @@ static void fd_accept_incoming_migration(void *opaque)
QEMUFile *f = opaque;
qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
- process_incoming_migration(f);
+ process_incoming_migration(f, qemu_stdio_fd(f));
}
int fd_start_incoming_migration(const char *infd)
@@ -135,7 +135,7 @@ static void tcp_accept_incoming_migration(void *opaque)
goto out;
}
- process_incoming_migration(f);
+ process_incoming_migration(f, c);
return;
out:
@@ -145,7 +145,7 @@ static void unix_accept_incoming_migration(void *opaque)
goto out;
}
- process_incoming_migration(f);
+ process_incoming_migration(f, c);
return;
out:
@@ -82,8 +82,9 @@ int qemu_start_incoming_migration(const char *uri, Error **errp)
return ret;
}
-void process_incoming_migration(QEMUFile *f)
+static void process_incoming_migration_co(void *opaque)
{
+ QEMUFile *f = opaque;
int ret;
ret = qemu_loadvm_state(f);
@@ -106,6 +107,20 @@ void process_incoming_migration(QEMUFile *f)
}
}
+static void enter_migration_coroutine(void *opaque)
+{
+ Coroutine *co = opaque;
+ qemu_coroutine_enter(co, NULL);
+}
+
+void process_incoming_migration(QEMUFile *f, int fd)
+{
+ Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
+ socket_set_nonblock(fd);
+ qemu_set_fd_handler(fd, enter_migration_coroutine, NULL, co);
+ qemu_coroutine_enter(co, f);
+}
+
/* amount of nanoseconds we are willing to wait for migration to be down.
* the choice of nanoseconds is because it is the maximum resolution that
* get_clock() can achieve. It is an internal measure. All user-visible
@@ -41,7 +41,7 @@ struct MigrationState
int64_t total_time;
};
-void process_incoming_migration(QEMUFile *f);
+void process_incoming_migration(QEMUFile *f, int fd);
int qemu_start_incoming_migration(const char *uri, Error **errp);
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- migration-exec.c | 2 +- migration-fd.c | 2 +- migration-tcp.c | 2 +- migration-unix.c | 2 +- migration.c | 17 ++++++++++++++++- migration.h | 2 +- 6 file modificati, 21 inserzioni(+), 6 rimozioni(-)