diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-09-27 13:30:15 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-11-02 18:35:07 +0100 |
commit | 6c3601361ff22cb8bda3f483ea11c4f7bd095094 (patch) | |
tree | 4294f16cf1572fa5118ca15f4dcfb618e39f4279 /migration-fd.c | |
parent | 09bac73c13b57acd304efb54a361c244d60d375c (diff) | |
download | hqemu-6c3601361ff22cb8bda3f483ea11c4f7bd095094.zip hqemu-6c3601361ff22cb8bda3f483ea11c4f7bd095094.tar.gz |
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>
Diffstat (limited to 'migration-fd.c')
-rw-r--r-- | migration-fd.c | 33 |
1 files changed, 15 insertions, 18 deletions
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) |