commit cfaf6d36ae761da1033159d85d670706ffb24fb9
author Juan Quintela <quintela@redhat.com> Wed Mar 10 00:10:35 2010 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Wed Mar 17 11:16:15 2010 -0500
tree a5165f1ba834d1478cf407fd9d66dd1efb0dcc7c
parent 0056dcc1146545e7c814db83b7b7b62e0c93ac68

migration: Clear fd also in error cases

Not clearing the fd and closing the file makes qemu spin using 100%CPU
after incoming migration error.

See for instance bug:
https://bugzilla.redhat.com/show_bug.cgi?id=518032

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

migration-unix.c

diff --git a/migration-unix.c b/migration-unix.c
index b7aab38..ce59a2a 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -176,13 +176,12 @@
     qemu_announce_self();
     DPRINTF("successfully loaded vm state\n");
 
-    /* we've successfully migrated, close the server socket */
-    qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
-    close(s);
 
 out_fopen:
     qemu_fclose(f);
 out:
+    qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
+    close(s);
     close(c);
 }