OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Block patches for 5.1: 

- Coverity fix
 - iotests fix for rx and avr
 - iotests fix for qcow2 -o compat=0.10
 -----BEGIN PGP SIGNATURE-----
 
 iQFGBAABCAAwFiEEkb62CjDbPohX0Rgp9AfbAGHVz0AFAl8e5mcSHG1yZWl0ekBy
 ZWRoYXQuY29tAAoJEPQH2wBh1c9A8WEIAIgYTPqy+BeJ6xaNczH2fsYoYq9uwPfb
 bKkPp5UAaV4krmpDCaddMGK4xu/92t/i5iRTxuhik1CufzUe2rWWO7KNLi5Qpi0X
 9bOCQmlOWpmykyWz5UQ9Vd3W9+rdpyESJ+FCrd3K7DGh13l70vP3f5x/iLFOlnia
 50MBD1Y3+zRqpHcxu8gP5Q+TOlddgRkuuX2STPo6DQnmI3llL3FFWQhcT+OfltJl
 Avc9AF91CoimuDyIDSlONphsx8WWbA/3byYxqINdN0aRy8hrQ+l+BzAMZOGjYxIM
 Sy++rUPHeIQbOlmY06UNA+J6sWcG9bipc1xaSEUr/I8iZ1AbL01O91A=
 =QzwY
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-07-27' into staging

Block patches for 5.1:
- Coverity fix
- iotests fix for rx and avr
- iotests fix for qcow2 -o compat=0.10

# gpg: Signature made Mon 27 Jul 2020 15:36:23 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2020-07-27:
  iotests/197: Fix for compat=0.10
  iotests: Select a default machine for the rx and avr targets
  block/amend: Check whether the node exists

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-07-28 09:15:44 +01:00
parent 93ea484375 1855536256
commit 23ae28783f
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/amend.c
View File

@ -69,8 +69,12 @@ void qmp_x_blockdev_amend(const char *job_id,
BlockdevAmendJob *s;
const char *fmt = BlockdevDriver_str(options->driver);
BlockDriver *drv = bdrv_find_format(fmt);
BlockDriverState *bs = bdrv_find_node(node_name);
BlockDriverState *bs;
bs = bdrv_lookup_bs(NULL, node_name, errp);
if (!bs) {
return;
}
if (!drv) {
error_setg(errp, "Block driver '%s' not found or not supported", fmt);

4
tests/qemu-iotests/197
View File

@ -112,7 +112,9 @@ echo
echo '=== Partial final cluster ==='
echo
_make_test_img 1024
# Force compat=1.1, because writing zeroes on a v2 image without a
# backing file would just result in an unallocated cluster
_make_test_img -o compat=1.1 1024
$QEMU_IO -f $IMGFMT -C -c 'read 0 1024' "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -f $IMGFMT -c map "$TEST_IMG"
_check_test_img

14
tests/qemu-iotests/check
View File

@ -595,15 +595,19 @@ then
fi
export QEMU_PROG="$(type -p "$QEMU_PROG")"
export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
case "$QEMU_PROG" in
*qemu-system-arm|*qemu-system-aarch64)
export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest"
export QEMU_OPTIONS="$QEMU_OPTIONS -machine virt"
;;
*qemu-system-avr)
export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"
;;
*qemu-system-rx)
export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"
;;
*qemu-system-tricore)
export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"
;;
*)
export QEMU_OPTIONS="-nodefaults -display none -accel qtest"
export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"
;;
esac