Commit 6c360136 authored Sep 27, 2012 by Paolo Bonzini

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>

parent 09bac73c

migration-exec.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -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

+15 −18

Original line number	Diff line number	Diff line
		@@ -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,10 +66,8 @@ static int fd_close(MigrationState *s)
		if (ret != 0) {
		ret = -errno;
		perror("migration-fd: close");
		return ret;
		}
		}
		return 0;
		return ret;
		}

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

migration-tcp.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}