Merge remote-tracking branch 'quintela/thread-20121220.next' into staging

[qemu.git] / migration-exec.c

diff --git a/migration-exec.c b/migration-exec.c
index 68f36f41f11518593d9c259565475578e0ee3d7e..a051a6e668ead21b40bee1a5c649581d46f5fc8d 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -18,7 +18,7 @@
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 #include "migration/migration.h"
-#include "buffered_file.h"
+#include "migration/qemu-file.h"
 #include "block/block.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -69,7 +69,6 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error
 
     s->fd = fileno(f);
     assert(s->fd != -1);
-    socket_set_nonblock(s->fd);
 
     s->opaque = qemu_popen(f, "w");