target-i386: Postpone cpuid_level update to realize time

[qemu.git] / migration-fd.c

diff --git a/migration-fd.c b/migration-fd.c
index ce6932d7c30324f877c04b5aeb73c74b6e09a63a..5fe28e09fda5085c092fceeba3f6b1c548588d51 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -48,29 +48,26 @@ static int fd_close(MigrationState *s)
     int ret;
 
     DPRINTF("fd_close\n");
     int ret;
 
     DPRINTF("fd_close\n");

-    if (s->fd != -1) {
-        ret = fstat(s->fd, &st);
-        if (ret == 0 && S_ISREG(st.st_mode)) {
-            /*
-             * If the file handle is a regular file make sure the
-             * data is flushed to disk before signaling success.
-             */
-            ret = fsync(s->fd);
-            if (ret != 0) {
-                ret = -errno;
-                perror("migration-fd: fsync");
-                return ret;
-            }
-        }
-        ret = close(s->fd);
-        s->fd = -1;
+    ret = fstat(s->fd, &st);
+    if (ret == 0 && S_ISREG(st.st_mode)) {
+        /*
+         * If the file handle is a regular file make sure the
+         * data is flushed to disk before signaling success.
+         */
+        ret = fsync(s->fd);

         if (ret != 0) {
             ret = -errno;
         if (ret != 0) {
             ret = -errno;

-            perror("migration-fd: close");
+            perror("migration-fd: fsync");

             return ret;
         }
     }
             return ret;
         }
     }

-    return 0;
+    ret = close(s->fd);
+    s->fd = -1;
+    if (ret != 0) {
+        ret = -errno;
+        perror("migration-fd: close");
+    }
+    return ret;

 }
 
 void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
 }
 
 void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)


@@ -92,9 +89,8 @@ static void fd_accept_incoming_migration(void *opaque)
 {
     QEMUFile *f = opaque;
 
 {
     QEMUFile *f = opaque;
 

+    qemu_set_fd_handler2(qemu_get_fd(f), NULL, NULL, NULL, NULL);

     process_incoming_migration(f);
     process_incoming_migration(f);

-    qemu_set_fd_handler2(qemu_stdio_fd(f), NULL, NULL, NULL, NULL);
-    qemu_fclose(f);

 }
 
 void fd_start_incoming_migration(const char *infd, Error **errp)
 }
 
 void fd_start_incoming_migration(const char *infd, Error **errp)