Commit 23ae2878 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 93ea4843 18555362

block/amend.c

+5 −1
Original line number Diff line number Diff line
@@ -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);

tests/qemu-iotests/197

+3 −1
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/check

+9 −5
Original line number Diff line number Diff line
@@ -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-tricore)

        export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest"

    *qemu-system-avr)

        export QEMU_OPTIONS="$QEMU_OPTIONS -machine mega2560"

        ;;

    *)

        export QEMU_OPTIONS="-nodefaults -display none -accel qtest"

    *qemu-system-rx)

        export QEMU_OPTIONS="$QEMU_OPTIONS -machine gdbsim-r5f562n8"

        ;;

    *qemu-system-tricore)

        export QEMU_OPTIONS="-$QEMU_OPTIONS -machine tricore_testboard"

        ;;

esac