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-exec.c | |
| parent | 09bac73c13b57acd304efb54a361c244d60d375c (diff) | |
| download | qemu-6c3601361ff22cb8bda3f483ea11c4f7bd095094.tar.gz qemu-6c3601361ff22cb8bda3f483ea11c4f7bd095094.tar.bz2 qemu-6c3601361ff22cb8bda3f483ea11c4f7bd095094.zip | |
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-exec.c')
| -rw-r--r-- | migration-exec.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/migration-exec.c b/migration-exec.c index 014c60f01d..2ce7770cfa 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; } |