qemu-io: Return non-zero exit code on failure
PATCH v2 1/2 qemu-io: Return non-zero exit code on failure
From: Nir Soffer <[email protected]>
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 a simple example - trying to read with the wrong format:
$ touch file
$ qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
can't open device file: Image is not in qcow2 format
no file open, try 'help open'
0With this patch, we fail earlier with exit code 1:
$ ./qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
can't open device file: Image is not in qcow2 format
1Signed-off-by Nir Soffer <[email protected]>
Reviewed-by Eric Blake <[email protected]>
Reviewed-by Fam Zheng <[email protected]>
---
Changes since v1:
- Improve commit message
- Add regression tests
qemu-io.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
qemu-io.c +6 -2
@@ -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 ();
Signature · 1 line
2.9.3