diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-18 20:04:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-18 20:04:54 +0100 |
| commit | a89af8c20ab289785806fcc1589b0f4265bd4e90 (patch) | |
| tree | b99e7b51dfe483304e96068807147edb9d98f4a5 /tests/qemu-iotests/223 | |
| parent | a28c9c8c9fc42484efe1bf5a77affe842e54e38b (diff) | |
| parent | d8154b0945f795177511ea0e2212bd5c749fe84c (diff) | |
| download | focaccia-qemu-a89af8c20ab289785806fcc1589b0f4265bd4e90.tar.gz focaccia-qemu-a89af8c20ab289785806fcc1589b0f4265bd4e90.zip | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-05-18' into staging
nbd patches for 2020-05-20 - fix stranded fd in 'qemu-nbd -c /dev/nbd0' - add 'qemu-img map --start-offset --max-length' options # gpg: Signature made Mon 18 May 2020 17:29:56 BST # gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full] # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full] # gpg: aka "[jpeg image of size 6874]" [full] # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2020-05-18: iotests: Enhance 223 to cover qemu-img map improvements qemu-img: Add --start-offset and --max-length to map qemu-img: refactor dump_map_entry JSON format output qemu-img: validate image length in img_map qemu_img: add cvtnum_full to print error reports qemu-nbd: Close inherited stderr Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/223')
| -rwxr-xr-x | tests/qemu-iotests/223 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/223 b/tests/qemu-iotests/223 index 56fbc5fb09..d68bc3cb6f 100755 --- a/tests/qemu-iotests/223 +++ b/tests/qemu-iotests/223 @@ -2,7 +2,7 @@ # # Test reading dirty bitmap over NBD # -# Copyright (C) 2018-2019 Red Hat, Inc. +# Copyright (C) 2018-2020 Red Hat, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -206,7 +206,9 @@ $QEMU_IMG map --output=json --image-opts \ nbd_server_start_unix_socket -f $IMGFMT -B b2 "$TEST_IMG" IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket" -$QEMU_IMG map --output=json --image-opts \ +$QEMU_IMG map --output=json --image-opts --max-length=12345 \ + "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map +$QEMU_IMG map --output=json --image-opts --start-offset=12345 \ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map # success, all done |