Commit 8ad9fa5d authored by aliguori's avatar aliguori

Fix brown-paper-bag bugs from live-migration patch (Charles Duffy)

In TCP migration, prevent an endless loop trying to retrieve error status. In
exec migration, set the close pointer in the FdMigrationState structure.

Color me embarrassed.

Signed-off-by: Charles Duffy <charles_duffy@messageone.com> 
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5713 c046a42c-6fe2-441c-8c8c-71466251a162
parent c310de86
......@@ -85,6 +85,7 @@ MigrationState *exec_start_outgoing_migration(const char *command,
s->opaque = qemu_popen(f, "w");
s->close = exec_close;
s->get_error = file_errno;
s->write = file_write;
s->mig_state.cancel = migrate_fd_cancel;
......
......@@ -32,7 +32,7 @@
static int socket_errno(FdMigrationState *s)
{
return (s->get_error(s));
return socket_error();
}
static int socket_write(FdMigrationState *s, const void * buf, size_t size)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment