Merge remote-tracking branch 'afaerber/qom-cpu' into staging

[qemu.git] / migration-unix.c

diff --git a/migration-unix.c b/migration-unix.c
index 9debc952daeefd360608383754daf557f48a4b15..218835a7a44ca8db3f5c53f00972ec620c15b3c7 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -14,9 +14,9 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
 #include "migration/migration.h"
-#include "buffered_file.h"
+#include "migration/qemu-file.h"
 #include "block/block.h"
 
 //#define DEBUG_MIGRATION_UNIX
@@ -60,6 +60,7 @@ static void unix_wait_for_connect(int fd, void *opaque)
     } else {
         DPRINTF("migrate connect success\n");
         s->fd = fd;
+        socket_set_block(s->fd);
         migrate_fd_connect(s);
     }
 }