migration: move qemu_fclose to process_incoming_migration

The common suffix is now just process_incoming_migration.

Reviewed-by: Orit Wasserman <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/migration-exec.c b/migration-exec.c
index 2ce7770cfab7aa2e0a164670f616d30887278ef2..2b6fcb426292f56e17bfbbb7393b11819e17e645 100644 (file)
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -87,7 +87,6 @@ static void exec_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 exec_start_incoming_migration(const char *command, Error **errp)

diff --git a/migration-fd.c b/migration-fd.c
index c678b23b7ed62b57173a69bd717a3d9391d4ad8e..5fe28e09fda5085c092fceeba3f6b1c548588d51 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -91,7 +91,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)

diff --git a/migration-tcp.c b/migration-tcp.c
index 1279cc9677b42fd4a9fab275d21716cbc3e07b42..5e855fe72f4d4246cda629758d857d7d61acd2aa 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -102,7 +102,6 @@ static void tcp_accept_incoming_migration(void *opaque)
     }
 
     process_incoming_migration(f);
-    qemu_fclose(f);
     return;
 
 out:

diff --git a/migration-unix.c b/migration-unix.c
index 96ea71b787728ec3fedde4dc0ba5cd1c5fb53175..dba72b4a543d9283ab756403cfef361273dd7692 100644 (file)
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -102,7 +102,6 @@ static void unix_accept_incoming_migration(void *opaque)
     }
 
     process_incoming_migration(f);
-    qemu_fclose(f);
     return;
 
 out:

diff --git a/migration.c b/migration.c
index a63596f9a0ba656291f9e4d9a2c1c2b0141c8cc6..2741d979fc2400ae4f4a84a6280eee91950a7cc3 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -85,7 +85,11 @@ void qemu_start_incoming_migration(const char *uri, Error **errp)
 
 void process_incoming_migration(QEMUFile *f)
 {
-    if (qemu_loadvm_state(f) < 0) {
+    int ret;
+
+    ret = qemu_loadvm_state(f);
+    qemu_fclose(f);
+    if (ret < 0) {
         fprintf(stderr, "load of migration failed\n");
         exit(0);
     }