From eccae2f252513d2965ef919022c3ed068da275bd Mon Sep 17 00:00:00 2001

From: Eric Blake <eblake@redhat.com>

Date: Tue, 2 Jun 2020 02:34:20 +0100

Subject: [PATCH 15/26] iotests: Add test 291 to for qemu-img bitmap coverage

RH-Author: Eric Blake <eblake@redhat.com>

Message-id: <20200602023420.2133649-13-eblake@redhat.com>

Patchwork-id: 97079

O-Subject: [RHEL-AV-8.2.1 qemu-kvm PATCH 12/12] iotests: Add test 291 to for qemu-img bitmap coverage

Bugzilla: 1779893 1779904

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

Add a new test covering the 'qemu-img bitmap' subcommand, as well as

'qemu-img convert --bitmaps', both added in recent patches.

Signed-off-by: Eric Blake <eblake@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20200521192137.1120211-6-eblake@redhat.com>

(cherry picked from commit cf2d1203dcfc2bf964453d83a2302231ce77f2dc)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

Conflicts:

	tests/qemu-iotests/group - context: other tests not backported

	tests/qemu-iotests/291.out - zstd compression not backported

Signed-off-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 tests/qemu-iotests/291     | 112 +++++++++++++++++++++++++++++++++++++++++++++

 tests/qemu-iotests/291.out |  78 +++++++++++++++++++++++++++++++

 tests/qemu-iotests/group   |   1 +

 3 files changed, 191 insertions(+)

 create mode 100755 tests/qemu-iotests/291

 create mode 100644 tests/qemu-iotests/291.out

diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291

new file mode 100755

index 0000000..3ca83b9

--- /dev/null

+++ b/tests/qemu-iotests/291

@@ -0,0 +1,112 @@

+#!/usr/bin/env bash

+#

+# Test qemu-img bitmap handling

+#

+# 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

+# the Free Software Foundation; either version 2 of the License, or

+# (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

+#

+

+seq="$(basename $0)"

+echo "QA output created by $seq"

+

+status=1 # failure is the default!

+

+_cleanup()

+{

+    _cleanup_test_img

+    nbd_server_stop

+}

+trap "_cleanup; exit \$status" 0 1 2 3 15

+

+# get standard environment, filters and checks

+. ./common.rc

+. ./common.filter

+. ./common.nbd

+

+_supported_fmt qcow2

+_supported_proto file

+_supported_os Linux

+_require_command QEMU_NBD

+

+echo

+echo "=== Initial image setup ==="

+echo

+

+# Create backing image with one bitmap

+TEST_IMG="$TEST_IMG.base" _make_test_img 10M

+$QEMU_IMG bitmap --add -f $IMGFMT "$TEST_IMG.base" b0

+$QEMU_IO -c 'w 3M 1M' -f $IMGFMT "$TEST_IMG.base" | _filter_qemu_io

+

+# Create initial image and populate two bitmaps: one active, one inactive.

+ORIG_IMG=$TEST_IMG

+TEST_IMG=$TEST_IMG.orig

+_make_test_img -b "$ORIG_IMG.base" -F $IMGFMT 10M

+$QEMU_IO -c 'w 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io

+$QEMU_IMG bitmap --add -g 512k -f $IMGFMT "$TEST_IMG" b1

+$QEMU_IMG bitmap --add --disable -f $IMGFMT "$TEST_IMG" b2

+$QEMU_IO -c 'w 3M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io

+$QEMU_IMG bitmap --clear -f $IMGFMT "$TEST_IMG" b1

+$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

+echo "=== Bitmap preservation not possible to non-qcow2 ==="

+echo

+

+TEST_IMG=$ORIG_IMG

+$QEMU_IMG convert --bitmaps -O raw "$TEST_IMG.orig" "$TEST_IMG" &&

+    echo "unexpected success"

+

+echo

+echo "=== Convert with bitmap preservation ==="

+echo

+

+# Only bitmaps from the active layer are copied

+$QEMU_IMG convert --bitmaps -O qcow2 "$TEST_IMG.orig" "$TEST_IMG"

+$QEMU_IMG info "$TEST_IMG" | _filter_img_info --format-specific

+# But we can also merge in bitmaps from other layers.  This test is a bit

+# contrived to cover more code paths, in reality, you could merge directly

+# into b0 without going through tmp

+$QEMU_IMG bitmap --add --disable -f $IMGFMT "$TEST_IMG" b0

+$QEMU_IMG bitmap --add --merge b0 -b "$TEST_IMG.base" -F $IMGFMT \

+     -f $IMGFMT "$TEST_IMG" tmp

+$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

+$QEMU_IMG info "$TEST_IMG" | _filter_img_info --format-specific

+

+echo

+echo "=== Check bitmap contents ==="

+echo

+

+# x-dirty-bitmap is a hack for reading bitmaps; it abuses block status to

+# report "data":false for portions of the bitmap which are set

+IMG="driver=nbd,server.type=unix,server.path=$nbd_unix_socket"

+nbd_server_start_unix_socket -r -f qcow2 -B b0 "$TEST_IMG"

+$QEMU_IMG map --output=json --image-opts \

+    "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b0" | _filter_qemu_img_map

+nbd_server_start_unix_socket -r -f qcow2 -B b1 "$TEST_IMG"

+$QEMU_IMG map --output=json --image-opts \

+    "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b1" | _filter_qemu_img_map

+nbd_server_start_unix_socket -r -f qcow2 -B b2 "$TEST_IMG"

+$QEMU_IMG map --output=json --image-opts \

+    "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b2" | _filter_qemu_img_map

+

+# success, all done

+echo '*** done'

+rm -f $seq.full

+status=0

diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out

new file mode 100644

index 0000000..14e5cfc

--- /dev/null

+++ b/tests/qemu-iotests/291.out

@@ -0,0 +1,78 @@

+QA output created by 291

+

+=== Initial image setup ===

+

+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=10485760

+wrote 1048576/1048576 bytes at offset 3145728

+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=10485760 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT

+wrote 1048576/1048576 bytes at offset 0

+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+wrote 1048576/1048576 bytes at offset 3145728

+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

+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)

+

+=== Bitmap preservation not possible to non-qcow2 ===

+

+qemu-img: Format driver 'raw' does not support bitmaps

+

+=== Convert with bitmap preservation ===

+

+image: TEST_DIR/t.IMGFMT

+file format: IMGFMT

+virtual size: 10 MiB (10485760 bytes)

+disk size: 4.39 MiB

+Format specific information:

+    compat: 1.1

+    lazy refcounts: false

+    bitmaps:

+        [0]:

+            flags:

+            name: b1

+            granularity: 524288

+        [1]:

+            flags:

+                [0]: auto

+            name: b2

+            granularity: 65536

+    refcount bits: 16

+    corrupt: false

+image: TEST_DIR/t.IMGFMT

+file format: IMGFMT

+virtual size: 10 MiB (10485760 bytes)

+disk size: 4.48 MiB

+Format specific information:

+    compat: 1.1

+    lazy refcounts: false

+    bitmaps:

+        [0]:

+            flags:

+            name: b1

+            granularity: 524288

+        [1]:

+            flags:

+                [0]: auto

+            name: b2

+            granularity: 65536

+        [2]:

+            flags:

+            name: b0

+            granularity: 65536

+    refcount bits: 16

+    corrupt: false

+

+=== Check bitmap contents ===

+

+[{ "start": 0, "length": 3145728, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

+{ "start": 3145728, "length": 1048576, "depth": 0, "zero": false, "data": false},

+{ "start": 4194304, "length": 6291456, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]

+[{ "start": 0, "length": 1048576, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

+{ "start": 1048576, "length": 1048576, "depth": 0, "zero": false, "data": false},

+{ "start": 2097152, "length": 8388608, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]

+[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

+{ "start": 2097152, "length": 1048576, "depth": 0, "zero": false, "data": false},

+{ "start": 3145728, "length": 7340032, "depth": 0, "zero": false, "data": true, "offset": OFFSET}]

+*** done

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group

index 9c565cf..033b54d 100644

--- a/tests/qemu-iotests/group

+++ b/tests/qemu-iotests/group

@@ -290,3 +290,4 @@

 280 rw migration quick

 281 rw quick

 284 rw

+291 rw quick

-- 

1.8.3.1