Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
qemu-io: Return non-zero exit code on failure 
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'
    0

With 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

Failing earlier, we don't log this error now:

    no file open, try 'help open'

But some tests expected it; the line was removed from the test output.

Signed-off-by: Nir Soffer <nirsof@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20170201003120.23378-2-nirsof@gmail.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
  • Loading branch information
@nirs @XanClic
nirs authored and XanClic committed Feb 8, 2017
1 parent 9708fd9 commit d943be0
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 84 deletions.
8 changes: 6 additions & 2 deletions qemu-io.c
View file
Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions tests/qemu-iotests/059.out
View file
Expand Up @@ -3,17 +3,14 @@ QA output created by 059
=== Testing invalid granularity ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.vmdk: Invalid granularity, image may be corrupt
no file open, try 'help open'

=== Testing too big L2 table size ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.vmdk: L2 table size too big
no file open, try 'help open'

=== Testing too big L1 table size ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.vmdk: L1 size too big
no file open, try 'help open'

=== Testing monolithicFlat creation and opening ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
Expand Down
1 change: 0 additions & 1 deletion tests/qemu-iotests/070.out
View file
Expand Up @@ -4,7 +4,6 @@ QA output created by 070
can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
To replay the log, run:
qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
no file open, try 'help open'
=== Verify open image replays log ===
read 18874368/18874368 bytes at offset 0
18 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Expand Down
7 changes: 0 additions & 7 deletions tests/qemu-iotests/075.out
View file
Expand Up @@ -10,29 +10,22 @@ read 512/512 bytes at offset 1048064

== block_size must be a multiple of 512 ==
can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
no file open, try 'help open'

== block_size cannot be zero ==
can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
no file open, try 'help open'

== huge block_size ===
can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
no file open, try 'help open'

== offsets_size overflow ===
can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
no file open, try 'help open'

== refuse images that require too many offsets ===
can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
no file open, try 'help open'

== refuse images with non-monotonically increasing offsets ==
can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
no file open, try 'help open'

== refuse images with invalid compressed block size ==
can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
no file open, try 'help open'
*** done
3 changes: 0 additions & 3 deletions tests/qemu-iotests/076.out
View file
Expand Up @@ -6,15 +6,12 @@ read 65536/65536 bytes at offset 0

== Negative catalog size ==
can't open device TEST_DIR/parallels-v1: Catalog too large
no file open, try 'help open'

== Overflow in catalog allocation ==
can't open device TEST_DIR/parallels-v1: Catalog too large
no file open, try 'help open'

== Zero sectors per track ==
can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
no file open, try 'help open'

== Read from a valid v2 image ==
read 65536/65536 bytes at offset 0
Expand Down
6 changes: 0 additions & 6 deletions tests/qemu-iotests/078.out
View file
Expand Up @@ -6,23 +6,17 @@ read 512/512 bytes at offset 0

== Negative catalog size ==
can't open device TEST_DIR/empty.bochs: Catalog size is too large
no file open, try 'help open'

== Overflow for catalog size * sizeof(uint32_t) ==
can't open device TEST_DIR/empty.bochs: Catalog size is too large
no file open, try 'help open'

== Too small catalog bitmap for image size ==
can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
no file open, try 'help open'
can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
no file open, try 'help open'

== Negative extent size ==
can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
no file open, try 'help open'

== Zero extent size ==
can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
no file open, try 'help open'
*** done
18 changes: 0 additions & 18 deletions tests/qemu-iotests/080.out
View file
Expand Up @@ -3,46 +3,33 @@ QA output created by 080
== Huge header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
no file open, try 'help open'

== Huge unknown header extension ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Invalid backing file offset
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Header extension too large
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Header extension too large
no file open, try 'help open'

== Huge refcount table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Reference count table too large
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Reference count table too large
no file open, try 'help open'

== Misaligned refcount table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Invalid reference count table offset
no file open, try 'help open'

== Huge refcount offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Invalid reference count table offset
no file open, try 'help open'

== Invalid snapshot table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Too many snapshots
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Too many snapshots
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Invalid snapshot table offset
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Invalid snapshot table offset
no file open, try 'help open'

== Hitting snapshot table size limit ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Expand All @@ -53,13 +40,9 @@ read 512/512 bytes at offset 0
== Invalid L1 table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Active L1 table too large
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Active L1 table too large
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Invalid L1 table offset
no file open, try 'help open'
can't open device TEST_DIR/t.qcow2: Invalid L1 table offset
no file open, try 'help open'

== Invalid L1 table (with internal snapshot in the image) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Expand All @@ -68,7 +51,6 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
== Invalid backing file size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow2: Backing file name too long
no file open, try 'help open'

== Invalid L2 entry (huge physical offset) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Expand Down
17 changes: 0 additions & 17 deletions tests/qemu-iotests/083.out
View file
Expand Up @@ -2,52 +2,42 @@ QA output created by 083
=== Check disconnect before neg1 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect after neg1 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 8 neg1 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 16 neg1 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect before export ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect after export ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 4 export ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 12 export ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 16 export ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect before neg2 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect after neg2 ===

Expand All @@ -56,12 +46,10 @@ read failed: Input/output error
=== Check disconnect 8 neg2 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect 10 neg2 ===

can't open device nbd:127.0.0.1:PORT:exportname=foo
no file open, try 'help open'

=== Check disconnect before request ===

Expand Down Expand Up @@ -99,27 +87,22 @@ read 512/512 bytes at offset 0
=== Check disconnect before neg-classic ===

can't open device nbd:127.0.0.1:PORT
no file open, try 'help open'

=== Check disconnect 8 neg-classic ===

can't open device nbd:127.0.0.1:PORT
no file open, try 'help open'

=== Check disconnect 16 neg-classic ===

can't open device nbd:127.0.0.1:PORT
no file open, try 'help open'

=== Check disconnect 24 neg-classic ===

can't open device nbd:127.0.0.1:PORT
no file open, try 'help open'

=== Check disconnect 28 neg-classic ===

can't open device nbd:127.0.0.1:PORT
no file open, try 'help open'

=== Check disconnect after neg-classic ===

Expand Down
6 changes: 0 additions & 6 deletions tests/qemu-iotests/088.out
View file
Expand Up @@ -3,15 +3,9 @@ QA output created by 088
== Invalid block size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.vpc: Invalid block size 0
no file open, try 'help open'
can't open device TEST_DIR/t.vpc: Invalid block size 0
no file open, try 'help open'
can't open device TEST_DIR/t.vpc: Invalid block size 128
no file open, try 'help open'
can't open device TEST_DIR/t.vpc: Invalid block size 128
no file open, try 'help open'
can't open device TEST_DIR/t.vpc: Invalid block size 305419896
no file open, try 'help open'
can't open device TEST_DIR/t.vpc: Invalid block size 305419896
no file open, try 'help open'
*** done
12 changes: 0 additions & 12 deletions tests/qemu-iotests/092.out
View file
Expand Up @@ -3,36 +3,24 @@ QA output created by 092
== Invalid cluster size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: Cluster size must be between 512 and 64k
no file open, try 'help open'

== Invalid L2 table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: L2 table size must be between 512 and 64k
no file open, try 'help open'

== Invalid size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow: Image too large
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: Image too large
no file open, try 'help open'

== Invalid backing file length ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
can't open device TEST_DIR/t.qcow: Backing file name too long
no file open, try 'help open'
can't open device TEST_DIR/t.qcow: Backing file name too long
no file open, try 'help open'
*** done
7 changes: 0 additions & 7 deletions tests/qemu-iotests/116.out
View file
Expand Up @@ -3,35 +3,28 @@ QA output created by 116
== truncated header cluster ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'

== invalid header magic ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Image not in QED format
no file open, try 'help open'

== invalid cluster size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'

== invalid table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'

== invalid header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'

== invalid L1 table offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'

== invalid image size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
no file open, try 'help open'
*** done
1 change: 0 additions & 1 deletion tests/qemu-iotests/131.out
View file
Expand Up @@ -23,7 +23,6 @@ read 32768/32768 bytes at offset 0
32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Corrupt image ==
can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
no file open, try 'help open'
ERROR image was not closed correctly

1 errors were found on the image.
Expand Down
1 change: 0 additions & 1 deletion tests/qemu-iotests/140.out
View file
Expand Up @@ -9,7 +9,6 @@ read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}}
can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: No export with name 'drv' available
no file open, try 'help open'
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
*** done

0 comments on commit d943be0

Please sign in to comment.