iotests/267: Create socket in $SOCK_DIR
Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 20191017133155.5327-23-mreitz@redhat.com Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
5b2da7f7cc
commit
f0e24942fc
|
@ -29,7 +29,7 @@ status=1 # failure is the default!
|
||||||
_cleanup()
|
_cleanup()
|
||||||
{
|
{
|
||||||
_cleanup_test_img
|
_cleanup_test_img
|
||||||
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
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ echo
|
||||||
|
|
||||||
IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
|
IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size
|
||||||
cat <<EOF |
|
cat <<EOF |
|
||||||
nbd_server_start unix:$TEST_DIR/nbd
|
nbd_server_start unix:$SOCK_DIR/nbd
|
||||||
nbd_server_add -w backing-fmt
|
nbd_server_add -w backing-fmt
|
||||||
savevm snap0
|
savevm snap0
|
||||||
info snapshots
|
info snapshots
|
||||||
|
|
|
@ -161,7 +161,7 @@ Internal snapshots on backing file:
|
||||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
|
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base
|
||||||
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
|
Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
|
||||||
QEMU X.Y.Z monitor - type 'help' for more information
|
QEMU X.Y.Z monitor - type 'help' for more information
|
||||||
(qemu) nbd_server_start unix:TEST_DIR/nbd
|
(qemu) nbd_server_start unix:SOCK_DIR/nbd
|
||||||
(qemu) nbd_server_add -w backing-fmt
|
(qemu) nbd_server_add -w backing-fmt
|
||||||
(qemu) savevm snap0
|
(qemu) savevm snap0
|
||||||
(qemu) info snapshots
|
(qemu) info snapshots
|
||||||
|
|
Loading…
Reference in a new issue