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

[qemu.git] / migration-fd.c

diff --git a/migration-fd.c b/migration-fd.c
index ea121bc0d6c406e412ebbb28f6273d5b12b2bcf7..a99e0e3971350bbe89929e477ae6810460fe266a 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -17,9 +17,8 @@
 #include "qemu/sockets.h"
 #include "migration/migration.h"
 #include "monitor/monitor.h"
-#include "buffered_file.h"
+#include "migration/qemu-file.h"
 #include "block/block.h"
-#include "qemu/sockets.h"
 
 //#define DEBUG_MIGRATION_FD
 
@@ -76,7 +75,6 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **
         return;
     }
 
-    fcntl(s->fd, F_SETFL, O_NONBLOCK);
     s->get_error = fd_errno;
     s->write = fd_write;
     s->close = fd_close;