Commit 4abf70a6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-06-24' into staging 



Block patches:
- Two iotest fixes

# gpg: Signature made Wed 24 Jun 2020 09:00:51 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-06-24:
  iotests: don't test qcow2.py inside 291
  iotests: Fix 051 output after qdev_init_nofail() removal

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6651620b 24b861c0

tests/qemu-iotests/051.pc.out

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

tests/qemu-iotests/291

+0 −4
Original line number Diff line number Diff line
@@ -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 ==="

tests/qemu-iotests/291.out

+0 −33
Original line number Diff line number Diff line
@@ -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                      <binary>



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                      <binary>



Header extension:

magic                     0x23852875 (Bitmaps)

length                    24

nb_bitmaps                3

reserved32                0

bitmap_directory_size     0x60

bitmap_directory_offset   0x520000





=== Check bitmap contents ===