Block: fix parallels block driver
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEi5wmzbL9FHyIDoahVh8kwfGfefsFAmLhi0cACgkQVh8kwfGf efs1Dg/7BwbaJu5uZEGhz3+KBRPk5kdYKX60bOojac27pBTVo4OyiP7QFzBt4c6+ 4yftT2vD7yTyzKANlmIYBvmjoIEw6eB09gJ5/mnUKgxTAS+thKo0e2v1zdncliy+ h9SEYRT3RhlePJYSssZx8lW4gfCG2JZi5xSjfqbG50X7I8RgDtMmcj7EUwkvCkaI WL3iZIuYPxkfFwbQ/6xVmwc6uE97tWom9Z0iyEgFIhtFGlrgV3zJrDJ2CbOXIbi+ 9c2j4zmnMUZLwtdT2CFwyvO03iU8eMJxqnt4aSyByOAd/rqko+ugHeE53eZkND0Q ci4bFq9XjgxOSsIqHXemIEUnuExhMuw5i7dtwR8w7K5Kwc88/44GTUgCZrPnBLx2 smGX0g7BiCpNYXA8DkquOsUQf8cS67M3rjdTB6SiMo0KuQHe5O0RDQAwu7f+hnTw vEyo8dk4xGqUvqYcOpLLBHDis1lghWwseC5gB/M6Q+KqvDF4WDpIWwPLfR1phJ0L kA1M9QO+NAcUtLEuT7N22QU8LMTxAX/hSYpR5Jrt5g3R26h7w7VZEvJbpQaytXTY VhDVWAGg9Xn3oxGTEyVqGP3Avik9OeoK9gCFiIyTEOL1jfEXqOsX8V6QkpaKP6c+ WXWiWfV9A9D7O556Z92hUeDuWhQKb2w1dry2e7DPeSWiUmgHtyY= =QfFj -----END PGP SIGNATURE----- Merge tag 'pull-block-2022-07-27' of https://gitlab.com/vsementsov/qemu into staging Block: fix parallels block driver # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEi5wmzbL9FHyIDoahVh8kwfGfefsFAmLhi0cACgkQVh8kwfGf # efs1Dg/7BwbaJu5uZEGhz3+KBRPk5kdYKX60bOojac27pBTVo4OyiP7QFzBt4c6+ # 4yftT2vD7yTyzKANlmIYBvmjoIEw6eB09gJ5/mnUKgxTAS+thKo0e2v1zdncliy+ # h9SEYRT3RhlePJYSssZx8lW4gfCG2JZi5xSjfqbG50X7I8RgDtMmcj7EUwkvCkaI # WL3iZIuYPxkfFwbQ/6xVmwc6uE97tWom9Z0iyEgFIhtFGlrgV3zJrDJ2CbOXIbi+ # 9c2j4zmnMUZLwtdT2CFwyvO03iU8eMJxqnt4aSyByOAd/rqko+ugHeE53eZkND0Q # ci4bFq9XjgxOSsIqHXemIEUnuExhMuw5i7dtwR8w7K5Kwc88/44GTUgCZrPnBLx2 # smGX0g7BiCpNYXA8DkquOsUQf8cS67M3rjdTB6SiMo0KuQHe5O0RDQAwu7f+hnTw # vEyo8dk4xGqUvqYcOpLLBHDis1lghWwseC5gB/M6Q+KqvDF4WDpIWwPLfR1phJ0L # kA1M9QO+NAcUtLEuT7N22QU8LMTxAX/hSYpR5Jrt5g3R26h7w7VZEvJbpQaytXTY # VhDVWAGg9Xn3oxGTEyVqGP3Avik9OeoK9gCFiIyTEOL1jfEXqOsX8V6QkpaKP6c+ # WXWiWfV9A9D7O556Z92hUeDuWhQKb2w1dry2e7DPeSWiUmgHtyY= # =QfFj # -----END PGP SIGNATURE----- # gpg: Signature made Wed 27 Jul 2022 12:00:23 PM PDT # gpg: using RSA key 8B9C26CDB2FD147C880E86A1561F24C1F19F79FB # gpg: Good signature from "Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>" [unknown] # gpg: aka "Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 8B9C 26CD B2FD 147C 880E 86A1 561F 24C1 F19F 79FB * tag 'pull-block-2022-07-27' of https://gitlab.com/vsementsov/qemu: iotests/131: Add parallels regression test block/parallels: Fix buffer-based write call Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
3e4abe2c92
|
|
@ -241,8 +241,8 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
|
||||
nb_cow_bytes, buf, 0);
|
||||
ret = bdrv_co_pwrite(bs->file, s->data_end * BDRV_SECTOR_SIZE,
|
||||
nb_cow_bytes, buf, 0);
|
||||
qemu_vfree(buf);
|
||||
if (ret < 0) {
|
||||
return ret;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ _supported_os Linux
|
|||
|
||||
inuse_offset=$((0x2c))
|
||||
|
||||
size=64M
|
||||
size=$((64 * 1024 * 1024))
|
||||
CLUSTER_SIZE=64k
|
||||
IMGFMT=parallels
|
||||
_make_test_img $size
|
||||
|
|
@ -70,6 +70,39 @@ _check_test_img
|
|||
_check_test_img -r all
|
||||
{ $QEMU_IO -c "read -P 0x11 64k 64k" "$TEST_IMG"; } 2>&1 | _filter_qemu_io | _filter_testdir
|
||||
|
||||
echo "== allocate with backing =="
|
||||
# Verify that allocating clusters works fine even when there is a backing image.
|
||||
# Regression test for a bug where we would pass a buffer read from the backing
|
||||
# node as a QEMUIOVector object, which could cause anything from I/O errors over
|
||||
# assertion failures to invalid reads from memory.
|
||||
|
||||
# Clear image
|
||||
_make_test_img $size
|
||||
# Create base image
|
||||
TEST_IMG="$TEST_IMG.base" _make_test_img $size
|
||||
|
||||
# Write some data to the base image (which would trigger an assertion failure if
|
||||
# interpreted as a QEMUIOVector)
|
||||
$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG.base" | _filter_qemu_io
|
||||
|
||||
# Parallels does not seem to support storing a backing filename in the image
|
||||
# itself, so we need to build our backing chain on the command line
|
||||
imgopts="driver=$IMGFMT,file.driver=$IMGPROTO,file.filename=$TEST_IMG"
|
||||
imgopts+=",backing.driver=$IMGFMT"
|
||||
imgopts+=",backing.file.driver=$IMGPROTO,backing.file.filename=$TEST_IMG.base"
|
||||
|
||||
# Cause allocation in the top image
|
||||
QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
|
||||
$QEMU_IO --image-opts "$imgopts" -c 'write -P 1 0 64' | _filter_qemu_io
|
||||
|
||||
# Verify
|
||||
QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \
|
||||
$QEMU_IO --image-opts "$imgopts" \
|
||||
-c 'read -P 1 0 64' \
|
||||
-c "read -P 42 64 $((64 * 1024 - 64))" \
|
||||
-c "read -P 0 64k $((size - 64 * 1024))" \
|
||||
| _filter_qemu_io
|
||||
|
||||
# success, all done
|
||||
echo "*** done"
|
||||
rm -f $seq.full
|
||||
|
|
|
|||
|
|
@ -37,4 +37,17 @@ Double checking the fixed image now...
|
|||
No errors were found on the image.
|
||||
read 65536/65536 bytes at offset 65536
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
== allocate with backing ==
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
||||
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
|
||||
wrote 65536/65536 bytes at offset 0
|
||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
wrote 64/64 bytes at offset 0
|
||||
64 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read 64/64 bytes at offset 0
|
||||
64 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read 65472/65472 bytes at offset 64
|
||||
63.938 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
read 67043328/67043328 bytes at offset 65536
|
||||
63.938 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
*** done
|
||||
|
|
|
|||
Loading…
Reference in New Issue