[Qemu-devel] [PATCH] Fix brown-paper-bag bugs from live-migration patch

[Charles Duffy <Charles_Duffy@messageone.com>]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

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>

[-- Attachment #2: migration-brown-paper-bag-fixes.patch --]
[-- Type: text/x-patch, Size: 716 bytes --]

diff --git a/migration-exec.c b/migration-exec.c
index 5d0b215..caeed4b 100644
--- 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 100644b..6fc1943 100644
--- 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)