X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=migration-fd.c;h=a99e0e3971350bbe89929e477ae6810460fe266a;hb=e9a970a8316f9f86a6c800a9a90175bd593f862c;hp=c678b23b7ed62b57173a69bd717a3d9391d4ad8e;hpb=6c3601361ff22cb8bda3f483ea11c4f7bd095094;p=qemu.git

diff --git a/migration-fd.c b/migration-fd.c
index c678b23b7..a99e0e397 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -14,13 +14,11 @@
  */
 
 #include "qemu-common.h"
-#include "qemu_socket.h"
-#include "migration.h"
-#include "monitor.h"
-#include "qemu-char.h"
-#include "buffered_file.h"
-#include "block.h"
-#include "qemu_socket.h"
+#include "qemu/sockets.h"
+#include "migration/migration.h"
+#include "monitor/monitor.h"
+#include "migration/qemu-file.h"
+#include "block/block.h"
 
 //#define DEBUG_MIGRATION_FD
 
@@ -77,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;
@@ -91,7 +88,6 @@ static void fd_accept_incoming_migration(void *opaque)
 
     qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);
     process_incoming_migration(f);
-    qemu_fclose(f);
 }
 
 void fd_start_incoming_migration(const char *infd, Error **errp)