aboutsummaryrefslogtreecommitdiffstats
path: root/migration-tcp.c
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-12 22:29:11 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2008-11-12 22:29:11 +0000
commit8ad9fa5d8be7fd04e723020088eca664971eb363 (patch)
tree05c3f09b338ab578b79e55755e32c30aa77fc083 /migration-tcp.c
parentc310de8657b12e805b2ac225e6932b8beed013cf (diff)
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
Diffstat (limited to 'migration-tcp.c')
-rw-r--r--migration-tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration-tcp.c b/migration-tcp.c
index 100644ba2..6fc1943d8 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)