[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] qemu-io: Return non-zero exit code on failure
From: |
Nir Soffer |
Subject: |
[Qemu-devel] [PATCH] qemu-io: Return non-zero exit code on failure |
Date: |
Wed, 11 Jan 2017 20:24:55 +0200 |
From: Nir Soffer <address@hidden>
The result of openfile was not checked, leading to failure deep in the
actual command with confusing error message, and exiting with exit code 0.
Here is one example - trying to read a pattern from an invalid chain:
$ qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?
can't open device top.qcow2: Could not open backing file: Image is not in
qcow2 format
no file open, try 'help open'
0
With this patch, we fail earlier with exit code 1:
$ ./qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?
can't open device top.qcow2: Could not open backing file: Image is not
in qcow2 format
1
Signed-off-by: Nir Soffer <address@hidden>
---
qemu-io.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index 23a229f..427cbae 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -595,13 +595,17 @@ int main(int argc, char **argv)
exit(1);
}
opts = qemu_opts_to_qdict(qopts, NULL);
- openfile(NULL, flags, writethrough, opts);
+ if (openfile(NULL, flags, writethrough, opts)) {
+ exit(1);
+ }
} else {
if (format) {
opts = qdict_new();
qdict_put(opts, "driver", qstring_from_str(format));
}
- openfile(argv[optind], flags, writethrough, opts);
+ if (openfile(argv[optind], flags, writethrough, opts)) {
+ exit(1);
+ }
}
}
command_loop();
--
2.9.3
- [Qemu-devel] [PATCH] qemu-io: Return non-zero exit code on failure,
Nir Soffer <=