migration: xxx_close will only be called once

No need to test s->fd again, it is tested in the caller.

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

migration-exec.c

@@ -48,7 +48,6 @@ static int exec_close(MigrationState *s)
 {
     int ret = 0;
     DPRINTF("exec_close\n");
-    if (s->opaque) {
     ret = qemu_fclose(s->opaque);
     s->opaque = NULL;
     s->fd = -1;
@@ -56,7 +55,6 @@ static int exec_close(MigrationState *s)
         /* close succeeded, but non-zero exit code: */
         ret = -EIO; /* fake errno value */
     }
-    }
     return ret;
 }
 

migration-fd.c

@@ -48,7 +48,6 @@ static int fd_close(MigrationState *s)
     int ret;
 
     DPRINTF("fd_close\n");
-    if (s->fd != -1) {
     ret = fstat(s->fd, &st);
     if (ret == 0 && S_ISREG(st.st_mode)) {
         /*
@@ -67,11 +66,9 @@ static int fd_close(MigrationState *s)
     if (ret != 0) {
         ret = -errno;
         perror("migration-fd: close");
+    }
     return ret;
 }
-    }
-    return 0;
-}
 
 void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error **errp)
 {

migration-tcp.c

@@ -44,11 +44,8 @@ static int tcp_close(MigrationState *s)
 {
     int r = 0;
     DPRINTF("tcp_close\n");
-    if (s->fd != -1) {
     if (closesocket(s->fd) < 0) {
-            r = -errno;
-        }
-        s->fd = -1;
+        r = -socket_error();
     }
     return r;
 }

migration-unix.c

@@ -44,12 +44,9 @@ static int unix_close(MigrationState *s)
 {
     int r = 0;
     DPRINTF("unix_close\n");
-    if (s->fd != -1) {
     if (close(s->fd) < 0) {
         r = -errno;
     }
-        s->fd = -1;
-    }
     return r;
 }