Skip to contentSkip to conversation

qemu-io: Return non-zero exit code on failure

PATCH Superseded Nir Soffer 3 participants 5 messages Jan 11, 2017 – Jan 12, 2017

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Nir Soffer

author
#0 lore raw

PATCH 1/1 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 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
---
 qemu-io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
qemu-io.c +6 -2
index 23a229f..427cbae 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 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.

Here is one example - trying to read a pattern from an invalid chain:

    $ qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?

As written, you have to guess some context about how top.qcow2 was created. The example can be made a bit more reproducible with:

$ : > file
$ qemu-io -f qcow2 -c ... file
Quoted 11 lines

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
Quoted 4 lines
---
 qemu-io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Whether or not the commit message is improved,

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
Reviewed-by
#2 lore raw
Quoted 8 lines · Eric Blake
Quoted 7 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.

Here is one example - trying to read a pattern from an invalid chain:

Quoted 7 lines
Quoted 1 line
    $ qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?

As written, you have to guess some context about how top.qcow2 was created. The example can be made a bit more reproducible with:

$ : > file
$ qemu-io -f qcow2 -c ... file

Nir, thank you for the fix. Could you also add a regression test in tests/qemu-iotests?

Quoted 19 lines
Quoted 12 lines

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
Quoted 4 lines
---
 qemu-io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Whether or not the commit message is improved,

author
#3 lore raw
Quoted 11 lines · Fam Zheng
Quoted 10 lines · Eric Blake
Quoted 8 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.

Here is one example - trying to read a pattern from an invalid chain:

    $ qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?
Quoted 8 lines
Quoted 5 lines

As written, you have to guess some context about how top.qcow2 was created. The example can be made a bit more reproducible with:

$ : > file
$ qemu-io -f qcow2 -c ... file

Nir, thank you for the fix. Could you also add a regression test in tests/qemu-iotests?

Sure, will look into it.

Quoted 22 lines
Quoted 19 lines
Quoted 12 lines

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
Quoted 4 lines
---
 qemu-io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Whether or not the commit message is improved,

author
#4 lore raw
In reply to Eric Blake
Quoted 8 lines · Eric Blake
Quoted 7 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.

Here is one example - trying to read a pattern from an invalid chain:

Quoted 7 lines
Quoted 1 line
    $ qemu-io -c 'read -P 1 0 1024' top.qcow2; echo $?

As written, you have to guess some context about how top.qcow2 was created. The example can be made a bit more reproducible with:

$ : > file
$ qemu-io -f qcow2 -c ... file

Right, I'll refine it in the next version.

Quoted 24 lines
Quoted 12 lines

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
Quoted 4 lines
---
 qemu-io.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Whether or not the commit message is improved,

--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org