diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 13:21:33 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 13:21:33 +0100 |
| commit | cf44d31d35df3de9d4f49339254050195f777f3e (patch) | |
| tree | 86c483b7cb76865aaa58786d917d68e9dab5a530 /tests/qemu-iotests/085 | |
| parent | 5dd8990841a9e331d9d4838a116291698208cbb6 (diff) | |
| parent | 01fa55982692fb51a16049b63b571651a1053989 (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-18-v2' into staging
QAPI patches for 2017-07-18
# gpg: Signature made Mon 24 Jul 2017 12:40:56 BST
# gpg: using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2017-07-18-v2:
migration: Use JSON null instead of "" to reset parameter to default
migration: Unshare MigrationParameters struct for now
migration: Add TODO comments on duplication of QAPI_CLONE()
migration: Clean up around tls_creds, tls_hostname
hmp: Clean up and simplify hmp_migrate_set_parameter()
block: Use JSON null instead of "" to disable backing file
tests/test-qobject-input-visitor: Drop redundant test
qapi: Introduce a first class 'null' type
qapi: Use QNull for a more regular visit_type_null()
qapi: Separate type QNull from QObject
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/085')
| -rwxr-xr-x | tests/qemu-iotests/085 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 71efe50d34..5c7668cf9b 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -106,7 +106,7 @@ function add_snapshot_image() snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}" _make_test_img -u -b "${base_image}" "$size" mv "${TEST_IMG}" "${snapshot_file}" - do_blockdev_add "$1" "'backing': '', " "${snapshot_file}" + do_blockdev_add "$1" "'backing': null, " "${snapshot_file}" } # ${1}: unique identifier for the snapshot filename |