Re: [PATCH 21/23] iotests/240: Create socket in $SOCK_DIR

[Eric Blake]

On 10/10/19 10:24 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <address@hidden>
> ---
>   tests/qemu-iotests/240 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Eric Blake <address@hidden>

> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index f73bc07d80..8b4337b58d 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -29,7 +29,7 @@ status=1      # failure is the default!
>   
>   _cleanup()
>   {
> -    rm -f "$TEST_DIR/nbd"
> +    rm -f "$SOCK_DIR/nbd"
>   }
>   trap "_cleanup; exit \$status" 0 1 2 3 15
>   
> @@ -135,7 +135,7 @@ echo
>   run_qemu <<EOF
>   { "execute": "qmp_capabilities" }
>   { "execute": "blockdev-add", "arguments": {"driver": "null-co", "read-zeroes": true, "node-name": 
> "hd0", "read-only": true}}
> -{ "execute": "nbd-server-start", "arguments": 
> {"addr":{"type":"unix","data":{"path":"$TEST_DIR/nbd"}}}}
> +{ "execute": "nbd-server-start", "arguments": 
> {"addr":{"type":"unix","data":{"path":"$SOCK_DIR/nbd"}}}}
>   { "execute": "nbd-server-add", "arguments": {"device":"hd0"}}
>   { "execute": "object-add", "arguments": {"qom-type": "iothread", "id": 
> "iothread0"}}
>   { "execute": "device_add", "arguments": {"id": "scsi0", "driver": "${virtio_scsi}", 
> "iothread": "iothread0"}}

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org