[Qemu-devel] [5713] Fix brown-paper-bag bugs from live-migration patch (Charles Duffy)

[Qemu-devel] [5713] Fix brown-paper-bag bugs from live-migration patch (Charles Duffy)

[Anthony Liguori]

Revision: 5713
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5713
Author:   aliguori
Date:     2008-11-12 22:29:11 +0000 (Wed, 12 Nov 2008)

Log Message:
-----------
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>

Modified Paths:
--------------
    trunk/migration-exec.c
    trunk/migration-tcp.c

Modified: trunk/migration-exec.c
===================================================================
--- trunk/migration-exec.c	2008-11-12 20:36:27 UTC (rev 5712)
+++ trunk/migration-exec.c	2008-11-12 22:29:11 UTC (rev 5713)
@@ -85,6 +85,7 @@
 
     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;

Modified: trunk/migration-tcp.c
===================================================================
--- trunk/migration-tcp.c	2008-11-12 20:36:27 UTC (rev 5712)
+++ trunk/migration-tcp.c	2008-11-12 22:29:11 UTC (rev 5713)
@@ -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)