diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-11-26 16:45:49 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-12-18 11:20:57 +0100 |
| commit | f6dc1c31d3801dcbdf0c56574f9ff4f05180810c (patch) | |
| tree | a55c541dd526950abc4d6197c4b24068f7291556 /tests/qemu-iotests | |
| parent | 0da7d13a4c2ff8ac40aeb1bd24c5564c82624555 (diff) | |
| download | qemu-f6dc1c31d3801dcbdf0c56574f9ff4f05180810c.zip qemu-f6dc1c31d3801dcbdf0c56574f9ff4f05180810c.tar.gz qemu-f6dc1c31d3801dcbdf0c56574f9ff4f05180810c.tar.bz2 | |
block: Error out on image creation with conflicting size options
If both the create options (qemu-img create -o ...) and the size
parameter were given, the size parameter was silently ignored. Instead,
make specifying two sizes an error.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rwxr-xr-x | tests/qemu-iotests/049 | 5 | ||||
| -rw-r--r-- | tests/qemu-iotests/049.out | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049 index c100d30..051a1c7 100755 --- a/tests/qemu-iotests/049 +++ b/tests/qemu-iotests/049 @@ -78,6 +78,11 @@ for s in $sizes; do test_qemu_img create -f $IMGFMT -o size=$s "$TEST_IMG" done +echo "== 4. Specify size twice (-o and traditional parameter) ==" +echo + +test_qemu_img create -f $IMGFMT -o size=10M "$TEST_IMG" 20M + echo "== Check correct interpretation of suffixes for cluster size ==" echo sizes="1024 1024b 1k 1K 1M " diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out index 6b50540..affa55b 100644 --- a/tests/qemu-iotests/049.out +++ b/tests/qemu-iotests/049.out @@ -121,6 +121,11 @@ qemu-img: TEST_DIR/t.qcow2: Parameter 'size' expects a non-negative number below Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta- and exabytes, respectively. +== 4. Specify size twice (-o and traditional parameter) == + +qemu-img create -f qcow2 -o size=10M TEST_DIR/t.qcow2 20M +qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once + == Check correct interpretation of suffixes for cluster size == qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M |