qemu-io: Return non-zero exit code on failure
PATCH v3 1/3 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
1---
Changes since v2:
- Adding missing signed-off-by
- Fix tests expecting the wrong output
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
Quoted 5 lines · Nir Soffer
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.
When posting a series, please ensure that your messages are all marked In-Reply-To a 0/3 cover letter (it may help if you do 'git config format.coverletter auto').
Quoted 14 lines
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 1
Quoted 8 lines
Signed-off-by Nir Soffer <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Fam Zheng <[email protected]>---
Changes since v2:
- Adding missing signed-off-by
- Fix tests expecting the wrong output
I don't see any tests changed...
Quoted 3 lines
qemu-io.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
...in this diffstat. If something really changed in this particular patch since v2, then you should drop the Reviewed-by lines in order to make sure I re-review it. Or, if the changes you mention here are to other patches in the series, then the 0/3 cover letter would have been a better place to put that information.
Quoted 16 lines
qemu-io.c +3
-1@@ -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) {
qemu-io.c int main(int argc, char **argv) · line 611
Quoted 10 lines
qemu-io.c +3
-1opts =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 ();
At any rate, I'm happy with this current patch, even if its presentation in a series is less than ideal, so you can keep my R-b.
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Quoted 37 lines · Eric Blake
Quoted 5 lines · Nir Soffer
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.
When posting a series, please ensure that your messages are all marked In-Reply-To a 0/3 cover letter (it may help if you do 'git config format.coverletter auto').
Quoted 14 lines
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 1Quoted 8 lines
Signed-off-by Nir Soffer <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Fam Zheng <[email protected]>---
Changes since v2:
- Adding missing signed-off-by
- Fix tests expecting the wrong outputI don't see any tests changed...
Quoted 1 line
Quoted 8 lines
Quoted 2 lines
qemu-io.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)...in this diffstat. If something really changed in this particular patch since v2, then you should drop the Reviewed-by lines in order to make sure I re-review it. Or, if the changes you mention here are to other patches in the series, then the 0/3 cover letter would have been a better place to put that information.
This diffstat is a poor man cover letter, I'll resend a proper one.
Quoted 35 lines
Quoted 17 lines
qemu-io.c +3
-1@@ -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) {qemu-io.c int main(int argc, char **argv) · line 611
Quoted 10 lines
qemu-io.c +3
-1opts =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 ();At any rate, I'm happy with this current patch, even if its presentation in a series is less than ideal, so you can keep my R-b.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org