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: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5713 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/migration-exec.c b/migration-exec.c
index 5d0b215fd163e9c086d1ef02e44205c1422e812f..caeed4bbc0eee01493560206db136cd6b53a1575 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -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;

diff --git a/migration-tcp.c b/migration-tcp.c
index 100644ba273bccf58d0d1494aaac4c88a887a974..6fc1943d8bc2cbf550874a3dc774e8d5112602cf 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -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)