From e11543c53fed2634146b9223112bc5c941434607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 16 Jun 2020 17:49:49 +0200 Subject: [PATCH 1/2] iotests: Fix 051 output after qdev_init_nofail() removal MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 96927c744 replaced qdev_init_nofail() call by isa_realize_and_unref() which has a different error message. Update the test output accordingly. Gitlab CI error after merging b77b5b3dc7: https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375 Reported-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20200616154949.6586-1-philmd@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Max Reitz --- tests/qemu-iotests/051.pc.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 0ea80d35f0..da8ad87187 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -142,7 +142,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive if=ide QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty +(qemu) QEMU_PROG: Device needs media, but drive is empty Testing: -drive if=virtio QEMU X.Y.Z monitor - type 'help' for more information @@ -214,7 +214,7 @@ QEMU X.Y.Z monitor - type 'help' for more information Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only +(qemu) QEMU_PROG: Block node is read-only Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on QEMU X.Y.Z monitor - type 'help' for more information From 24b861c0386a17ea31eb824310c21118fb7be883 Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Thu, 18 Jun 2020 18:40:52 +0300 Subject: [PATCH 2/2] iotests: don't test qcow2.py inside 291 820c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291 with external data file. Actually, 291 is bad place for qcow2.py testing, better add a separate test. For now, drop qcow2.py testing from 291 to fix the regression. Fixes: 820c6bee534ec3b Reported-by: Max Reitz Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com> Reviewed-by: Eric Blake Signed-off-by: Max Reitz --- tests/qemu-iotests/291 | 4 ---- tests/qemu-iotests/291.out | 33 --------------------------------- 2 files changed, 37 deletions(-) diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291 index 28e4fb9b4d..1e0bb76959 100755 --- a/tests/qemu-iotests/291 +++ b/tests/qemu-iotests/291 @@ -64,8 +64,6 @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io $QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1 $QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2 $QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io -echo "Check resulting qcow2 header extensions:" -$PYTHON qcow2.py "$TEST_IMG" dump-header-exts echo echo "=== Bitmap preservation not possible to non-qcow2 ===" @@ -92,8 +90,6 @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0 $QEMU_IMG bitmap --remove --image-opts \ driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp _img_info --format-specific -echo "Check resulting qcow2 header extensions:" -$PYTHON qcow2.py "$TEST_IMG" dump-header-exts echo echo "=== Check bitmap contents ===" diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out index 08bfaaaa6b..9f661515b4 100644 --- a/tests/qemu-iotests/291.out +++ b/tests/qemu-iotests/291.out @@ -14,25 +14,6 @@ wrote 1048576/1048576 bytes at offset 1048576 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 1048576/1048576 bytes at offset 2097152 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -Check resulting qcow2 header extensions: -Header extension: -magic 0xe2792aca (Backing format) -length 5 -data 'qcow2' - -Header extension: -magic 0x6803f857 (Feature table) -length 336 -data - -Header extension: -magic 0x23852875 (Bitmaps) -length 24 -nb_bitmaps 2 -reserved32 0 -bitmap_directory_size 0x40 -bitmap_directory_offset 0x510000 - === Bitmap preservation not possible to non-qcow2 === @@ -84,20 +65,6 @@ Format specific information: granularity: 65536 refcount bits: 16 corrupt: false -Check resulting qcow2 header extensions: -Header extension: -magic 0x6803f857 (Feature table) -length 336 -data - -Header extension: -magic 0x23852875 (Bitmaps) -length 24 -nb_bitmaps 3 -reserved32 0 -bitmap_directory_size 0x60 -bitmap_directory_offset 0x520000 - === Check bitmap contents ===