[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] migration: xxx_close will only be called once
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/12] migration: xxx_close will only be called once |
Date: |
Fri, 2 Nov 2012 18:51:01 +0100 |
No need to test s->fd again, it is tested in the caller.
Reviewed-by: Orit Wasserman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration-exec.c | 14 ++++++--------
migration-fd.c | 33 +++++++++++++++------------------
migration-tcp.c | 7 ++-----
migration-unix.c | 7 ++-----
4 file modificati, 25 inserzioni(+), 36 rimozioni(-)
diff --git a/migration-exec.c b/migration-exec.c
index 014c60f..2ce7770 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -48,14 +48,12 @@ 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;
- if (ret >= 0 && !(WIFEXITED(ret) && WEXITSTATUS(ret) == 0)) {
- /* close succeeded, but non-zero exit code: */
- ret = -EIO; /* fake errno value */
- }
+ ret = qemu_fclose(s->opaque);
+ s->opaque = NULL;
+ s->fd = -1;
+ if (ret >= 0 && !(WIFEXITED(ret) && WEXITSTATUS(ret) == 0)) {
+ /* close succeeded, but non-zero exit code: */
+ ret = -EIO; /* fake errno value */
}
return ret;
}
diff --git a/migration-fd.c b/migration-fd.c
index a4cd83f..c678b23 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -48,29 +48,26 @@ 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)) {
- /*
- * 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;
- perror("migration-fd: close");
+ perror("migration-fd: fsync");
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)
diff --git a/migration-tcp.c b/migration-tcp.c
index 1a12f17..bb27ce8 100644
--- a/migration-tcp.c
+++ b/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;
+ if (closesocket(s->fd) < 0) {
+ r = -socket_error();
}
return r;
}
diff --git a/migration-unix.c b/migration-unix.c
index 5dc49cd..9b5521e 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -44,11 +44,8 @@ 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;
+ if (close(s->fd) < 0) {
+ r = -errno;
}
return r;
}
--
1.7.12.1
- [Qemu-devel] [PULL 00/12] Incoming migration coroutine, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 03/12] migration: add qemu_get_fd, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 01/12] migration: unify stdio-based QEMUFile operations, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 02/12] migration: consolidate QEMUFile methods in a single QEMUFileOps struct, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 04/12] migration: replace qemu_stdio_fd with qemu_get_fd, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 05/12] migration: clean up server sockets and handlers before invoking process_incoming_migration, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 06/12] migration: use migrate_fd_close in migrate_fd_cleanup, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 07/12] migration: use closesocket, not close, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 08/12] migration: xxx_close will only be called once,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/12] migration: close socket QEMUFile from socket_close, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 12/12] migration: move process_incoming_migration to a coroutine, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 10/12] migration: move qemu_fclose to process_incoming_migration, Paolo Bonzini, 2012/11/02
- [Qemu-devel] [PATCH 11/12] migration: handle EAGAIN while reading QEMUFile, Paolo Bonzini, 2012/11/02
- Re: [Qemu-devel] [PULL 00/12] Incoming migration coroutine, Anthony Liguori, 2012/11/02