On Wed, 01/20 17:38, Daniel P. Berrange wrote:
> diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087
> index 3386668..065d9af 100755
> --- a/tests/qemu-iotests/087
> +++ b/tests/qemu-iotests/087
> @@ -201,6 +201,7 @@ run_qemu -S <<EOF
> "options": {
> "driver": "$IMGFMT",
> "id": "disk",
> + "key-secret": "sec0",
> "file": {
> "driver": "file",
> "filename": "$TEST_IMG"
> @@ -228,6 +229,7 @@ run_qemu <<EOF
> "options": {
> "driver": "$IMGFMT",
> "id": "disk",
> + "key-secret": "sec0",
> "file": {
> "driver": "file",
> "filename": "$TEST_IMG"
> diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out
> index 5fc4823..6582dda 100644
> --- a/tests/qemu-iotests/087.out
> +++ b/tests/qemu-iotests/087.out
> @@ -49,7 +49,7 @@ QMP_VERSION
> Encrypted images are deprecated
> Support for them will be removed in a future release.
> You can use 'qemu-img convert' to convert your image to an unencrypted one.
> -{"error": {"class": "GenericError", "desc": "blockdev-add doesn't support
> encrypted devices"}}
> +{"return": {}}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "SHUTDOWN"}
>
> @@ -60,7 +60,7 @@ QMP_VERSION
> Encrypted images are deprecated
> Support for them will be removed in a future release.
> You can use 'qemu-img convert' to convert your image to an unencrypted one.
> -{"error": {"class": "GenericError", "desc": "Guest must be stopped for
> opening of encrypted image"}}
> +{"return": {}}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "SHUTDOWN"}
>
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index d9913f8..da78459 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -135,9 +135,9 @@ _make_test_img()
> # XXX(hch): have global image options?
> (
> if [ $use_backing = 1 ]; then
> - $QEMU_IMG create -f $IMGFMT $extra_img_options -b "$backing_file"
> "$img_name" $image_size 2>&1
> + $QEMU_IMG create $EXTRA_IMG_ARGS -f $IMGFMT $extra_img_options -b
> "$backing_file" "$img_name" $image_size 2>&1
> else
> - $QEMU_IMG create -f $IMGFMT $extra_img_options "$img_name"
> $image_size 2>&1
> + $QEMU_IMG create $EXTRA_IMG_ARGS -f $IMGFMT $extra_img_options
> "$img_name" $image_size 2>&1
> fi
> ) | _filter_img_create
>
Does this change belong to a separate patch?
Fam
