From e375fe3472f6d64971d3bd8e10a3f159e72435a1 Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 10 Nov 2011 10:41:46 -0200 Subject: [PATCH] exec_close(): return -errno on errors (v2) All qemu_fclose() callers were already changed to accept any negative value as error, so we now can change it to return -errno. When the process exits with a non-zero exit code, we return -EIO to as a fake errno value. Changes v1 -> v2: - Don't use "//" comments, to make checkpatch.pl happy Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori --- migration-exec.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/migration-exec.c b/migration-exec.c index 626b648634..e14552ec01 100644 --- a/migration-exec.c +++ b/migration-exec.c @@ -50,12 +50,9 @@ static int exec_close(MigrationState *s) ret = qemu_fclose(s->opaque); s->opaque = NULL; s->fd = -1; - if (ret >= 0 && - WIFEXITED(ret) - && WEXITSTATUS(ret) == 0) { - ret = 0; - } else { - ret = -1; + if (ret >= 0 && !(WIFEXITED(ret) && WEXITSTATUS(ret) == 0)) { + /* close succeeded, but non-zero exit code: */ + ret = -EIO; /* fake errno value */ } } return ret; -- GitLab