update VERSION for 1.4.2

[qemu.git] / migration-unix.c

diff --git a/migration-unix.c b/migration-unix.c
index 96ea71b787728ec3fedde4dc0ba5cd1c5fb53175..0ca2a21eed99c3d73518a9aa3517ea5525d6d9bf 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -14,11 +14,10 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
-#include "migration.h"
-#include "qemu-char.h"
-#include "buffered_file.h"
-#include "block.h"
+#include "qemu/sockets.h"
+#include "migration/migration.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"
 
 //#define DEBUG_MIGRATION_UNIX
 
@@ -61,6 +60,7 @@ static void unix_wait_for_connect(int fd, void *opaque)
     } else {
         DPRINTF("migrate connect success\n");
         s->fd = fd;
+        qemu_set_block(s->fd);
         migrate_fd_connect(s);
     }
 }
@@ -102,7 +102,6 @@ static void unix_accept_incoming_migration(void *opaque)
     }
 
     process_incoming_migration(f);
-    qemu_fclose(f);
     return;
 
 out: