Commit 135a4663 authored by Max Reitz's avatar Max Reitz
Browse files

iotests/223: Create socket in $SOCK_DIR 



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 20191017133155.5327-21-mreitz@redhat.com
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 9ea16864

tests/qemu-iotests/223

+7 −7
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ _cleanup() 
    nbd_server_stop

    nbd_server_stop

    _cleanup_test_img

    _cleanup_test_img

    _cleanup_qemu

    _cleanup_qemu

    rm -f "$TEST_DIR/nbd"

    rm -f "$SOCK_DIR/nbd"

}

}

trap "_cleanup; exit \$status" 0 1 2 3 15

trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -125,11 +125,11 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", 
  "arguments":{"device":"n"}}' "error" # Attempt add without server

  "arguments":{"device":"n"}}' "error" # Attempt add without server

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",

  "arguments":{"addr":{"type":"unix",

  "arguments":{"addr":{"type":"unix",

    "data":{"path":"'"$TEST_DIR/nbd"'"}}}}' "return"

    "data":{"path":"'"$SOCK_DIR/nbd"'"}}}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-start",

  "arguments":{"addr":{"type":"unix",

  "arguments":{"addr":{"type":"unix",

    "data":{"path":"'"$TEST_DIR/nbd"1'"}}}}' "error" # Attempt second server

    "data":{"path":"'"$SOCK_DIR/nbd"1'"}}}}' "error" # Attempt second server

$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"

$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

  "arguments":{"device":"n", "bitmap":"b"}}' "return"

  "arguments":{"device":"n", "bitmap":"b"}}' "return"

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",
@@ -145,14 +145,14 @@ _send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add", 
_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

_send_qemu_cmd $QEMU_HANDLE '{"execute":"nbd-server-add",

  "arguments":{"device":"n", "name":"n2", "writable":true,

  "arguments":{"device":"n", "name":"n2", "writable":true,

  "bitmap":"b2"}}' "return"

  "bitmap":"b2"}}' "return"

$QEMU_NBD_PROG -L -k "$TEST_DIR/nbd"

$QEMU_NBD_PROG -L -k "$SOCK_DIR/nbd"





echo

echo

echo "=== Contrast normal status to large granularity dirty-bitmap ==="

echo "=== Contrast normal status to large granularity dirty-bitmap ==="

echo

echo





QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT

QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT

IMG="driver=nbd,export=n,server.type=unix,server.path=$TEST_DIR/nbd"

IMG="driver=nbd,export=n,server.type=unix,server.path=$SOCK_DIR/nbd"

$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m 1m' \

$QEMU_IO -r -c 'r -P 0x22 512 512' -c 'r -P 0 512k 512k' -c 'r -P 0x11 1m 1m' \

  -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io

  -c 'r -P 0x33 2m 2m' --image-opts "$IMG" | _filter_qemu_io

$QEMU_IMG map --output=json --image-opts \

$QEMU_IMG map --output=json --image-opts \
@@ -164,7 +164,7 @@ echo 
echo "=== Contrast to small granularity dirty-bitmap ==="

echo "=== Contrast to small granularity dirty-bitmap ==="

echo

echo





IMG="driver=nbd,export=n2,server.type=unix,server.path=$TEST_DIR/nbd"

IMG="driver=nbd,export=n2,server.type=unix,server.path=$SOCK_DIR/nbd"

$QEMU_IMG map --output=json --image-opts \

$QEMU_IMG map --output=json --image-opts \

  "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map

  "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map