Re: [Qemu-devel] [PATCH v12 11/16] iotests: 172: Use separate images for multiple devices

[Max Reitz]

On 23.01.2017 13:30, Fam Zheng wrote:
> To avoid image lock failures.
> 
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  tests/qemu-iotests/172     | 53 
> ++++++++++++++++++++++++----------------------
>  tests/qemu-iotests/172.out | 50 ++++++++++++++++++++++---------------------
>  2 files changed, 54 insertions(+), 49 deletions(-)
> 
> diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
> index 1b7d3a1..f9d4cff 100755
> --- a/tests/qemu-iotests/172
> +++ b/tests/qemu-iotests/172
> @@ -86,6 +86,9 @@ size=720k
>  
>  _make_test_img $size
>  
> +TEST_IMG="$TEST_IMG.2" _make_test_img $size
> +TEST_IMG="$TEST_IMG.3" _make_test_img $size

These images should be removed in _cleanup.

Alternatively, you could use the good old driver=null-co,size=$size.

(btw, I'm amazed that size=720k works. Not sure if that is intended, but
I won't complain. It even works in JSON (with 'size': '720k').)

> +
>  # Default drive semantics:
>  #
>  # By default you get a single empty floppy drive. You can override it with
> @@ -105,7 +108,7 @@ echo === Using -fda/-fdb options ===
>  
>  check_floppy_qtree -fda "$TEST_IMG"
>  check_floppy_qtree -fdb "$TEST_IMG"
> -check_floppy_qtree -fda "$TEST_IMG" -fdb "$TEST_IMG"
> +check_floppy_qtree -fda "$TEST_IMG" -fdb "$TEST_IMG.2"
>  
>  
>  echo
> @@ -114,7 +117,7 @@ echo === Using -drive options ===
>  
>  check_floppy_qtree -drive if=floppy,file="$TEST_IMG"
>  check_floppy_qtree -drive if=floppy,file="$TEST_IMG",index=1
> -check_floppy_qtree -drive if=floppy,file="$TEST_IMG" -drive 
> if=floppy,file="$TEST_IMG",index=1
> +check_floppy_qtree -drive if=floppy,file="$TEST_IMG" -drive 
> if=floppy,file="$TEST_IMG.2",index=1
>  
>  echo
>  echo
> @@ -122,7 +125,7 @@ echo === Using -drive if=none and -global ===
>  
>  check_floppy_qtree -drive if=none,file="$TEST_IMG" -global 
> isa-fdc.driveA=none0
>  check_floppy_qtree -drive if=none,file="$TEST_IMG" -global 
> isa-fdc.driveB=none0
> -check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive 
> if=none,file="$TEST_IMG" \
> +check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive 
> if=none,file="$TEST_IMG.2" \
>                     -global isa-fdc.driveA=none0 -global isa-fdc.driveB=none1
>  
>  echo
> @@ -131,7 +134,7 @@ echo === Using -drive if=none and -device ===
>  
>  check_floppy_qtree -drive if=none,file="$TEST_IMG" -device floppy,drive=none0
>  check_floppy_qtree -drive if=none,file="$TEST_IMG" -device 
> floppy,drive=none0,unit=1
> -check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive 
> if=none,file="$TEST_IMG" \
> +check_floppy_qtree -drive if=none,file="$TEST_IMG",file.disable-lock=on 
> -drive if=none,file="$TEST_IMG.2" \

disable-lock is not yet available, and also I don't know why you are
using it here. Is it just an artifact from an earlier version, perhaps?

Rest looks good.

Max

>                     -device floppy,drive=none0 -device 
> floppy,drive=none1,unit=1
>  
>  echo

[...]

signature.asc
Description: OpenPGP digital signature