Skip to contentSkip to conversation

Fix brown-paper-bag bugs from live-migration patch

PATCH Applied Charles Duffy 2 participants 2 messages Nov 12, 2008

lore
Share & tools
lore

Charles Duffy

author
#0 lore raw

PATCH 1/1 Fix brown-paper-bag bugs from live-migration patch

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 <[email protected]>
migration-exec.c +1 -0
index 5d0b215..caeed4b 100644
@@ -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;
migration-tcp.c +1 -1
index 100644b..6fc1943 100644
@@ -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)
Applied
#1 lore raw
Quoted 5 lines · 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 <[email protected]>

Applied. Thanks.

Regards,

Anthony Liguori