From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 29/31] iotests: add parallels-read-bitmap test
Date: Fri, 5 Mar 2021 17:54:52 +0100 [thread overview]
Message-ID: <20210305165454.356840-30-kwolf@redhat.com> (raw)
In-Reply-To: <20210305165454.356840-1-kwolf@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Test support for reading bitmap from parallels image format.
parallels-with-bitmap.bz2 is generated on Virtuozzo by
parallels-with-bitmap.sh
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210224104707.88430-7-vsementsov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
.../sample_images/parallels-with-bitmap.bz2 | Bin 0 -> 203 bytes
.../sample_images/parallels-with-bitmap.sh | 51 ++++++++++++++++
.../qemu-iotests/tests/parallels-read-bitmap | 55 ++++++++++++++++++
.../tests/parallels-read-bitmap.out | 6 ++
4 files changed, 112 insertions(+)
create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2
create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap
create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out
diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 b/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2
new file mode 100644
index 0000000000000000000000000000000000000000..54892fd4d01bf743d395bd4f3d896494146ab5a9
GIT binary patch
literal 203
zcmV;+05tzXT4*^jL0KkKS@=;0bpT+Hf7|^?Km<xfFyKQJ7=Y^F-%vt;00~Ysa6|-=
zk&7Szk`SoS002EkfMftPG<ipnsiCK}K_sNmm}me3FiZr%Oaf_u5F8kD;mB_~cxD-r
z5P$(X{&Tq5C`<xK02D?NNdN+t$~z$m00O|zFh^ynq*yaCtkn+NZzWom<#OEoF`?zb
zv(i3x^K~wt!aLPcRBP+PckUsIh6*LgjYSh0`}#7hMC9NR5D)+W0d&8Mxgwk>NPH-R
Fx`3oHQ9u9y
literal 0
HcmV?d00001
diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
new file mode 100755
index 0000000000..30615aa6bd
--- /dev/null
+++ b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Test parallels load bitmap
+#
+# Copyright (c) 2021 Virtuozzo International GmbH.
+#
+# 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/>.
+#
+
+CT=parallels-with-bitmap-ct
+DIR=$PWD/parallels-with-bitmap-dir
+IMG=$DIR/root.hds
+XML=$DIR/DiskDescriptor.xml
+TARGET=parallels-with-bitmap.bz2
+
+rm -rf $DIR
+
+prlctl create $CT --vmtype ct
+prlctl set $CT --device-add hdd --image $DIR --recreate --size 2G
+
+# cleanup the image
+qemu-img create -f parallels $IMG 64G
+
+# create bitmap
+prlctl backup $CT
+
+prlctl set $CT --device-del hdd1
+prlctl destroy $CT
+
+dev=$(ploop mount $XML | sed -n 's/^Adding delta dev=\(\/dev\/ploop[0-9]\+\).*/\1/p')
+dd if=/dev/zero of=$dev bs=64K seek=5 count=2 oflag=direct
+dd if=/dev/zero of=$dev bs=64K seek=30 count=1 oflag=direct
+dd if=/dev/zero of=$dev bs=64K seek=10 count=3 oflag=direct
+ploop umount $XML # bitmap name will be in the output
+
+bzip2 -z $IMG
+
+mv $IMG.bz2 $TARGET
+
+rm -rf $DIR
diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap b/tests/qemu-iotests/tests/parallels-read-bitmap
new file mode 100755
index 0000000000..af6b9c5db3
--- /dev/null
+++ b/tests/qemu-iotests/tests/parallels-read-bitmap
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+#
+# Test parallels load bitmap
+#
+# Copyright (c) 2021 Virtuozzo International GmbH.
+#
+# 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/>.
+#
+
+import json
+import iotests
+from iotests import qemu_nbd_popen, qemu_img_pipe, log, file_path
+
+iotests.script_initialize(supported_fmts=['parallels'])
+
+nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir)
+disk = iotests.file_path('disk')
+bitmap = 'e4f2eed0-37fe-4539-b50b-85d2e7fd235f'
+nbd_opts = f'driver=nbd,server.type=unix,server.path={nbd_sock}' \
+ f',x-dirty-bitmap=qemu:dirty-bitmap:{bitmap}'
+
+
+iotests.unarchive_sample_image('parallels-with-bitmap', disk)
+
+
+with qemu_nbd_popen('--read-only', f'--socket={nbd_sock}',
+ f'--bitmap={bitmap}', '-f', iotests.imgfmt, disk):
+ out = qemu_img_pipe('map', '--output=json', '--image-opts', nbd_opts)
+ chunks = json.loads(out)
+ cluster = 64 * 1024
+
+ log('dirty clusters (cluster size is 64K):')
+ for c in chunks:
+ assert c['start'] % cluster == 0
+ assert c['length'] % cluster == 0
+ if c['data']:
+ continue
+
+ a = c['start'] // cluster
+ b = (c['start'] + c['length']) // cluster
+ if b - a > 1:
+ log(f'{a}-{b-1}')
+ else:
+ log(a)
diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap.out b/tests/qemu-iotests/tests/parallels-read-bitmap.out
new file mode 100644
index 0000000000..e8f6bc9e96
--- /dev/null
+++ b/tests/qemu-iotests/tests/parallels-read-bitmap.out
@@ -0,0 +1,6 @@
+Start NBD server
+dirty clusters (cluster size is 64K):
+5-6
+10-12
+30
+Kill NBD server
--
2.29.2
next prev parent reply other threads:[~2021-03-05 17:13 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 16:54 [PULL 00/31] Block layer patches Kevin Wolf
2021-03-05 16:54 ` [PULL 01/31] iotests: Drop deprecated 'props' from object-add Kevin Wolf
2021-03-05 16:54 ` [PULL 02/31] backup: Remove nodes from job in .clean() Kevin Wolf
2021-03-05 16:54 ` [PULL 03/31] backup-top: Refuse I/O in inactive state Kevin Wolf
2021-03-05 16:54 ` [PULL 04/31] iotests/283: Check that finalize drops backup-top Kevin Wolf
2021-03-05 16:54 ` [PULL 05/31] iotests: Fix up python style in 300 Kevin Wolf
2021-03-05 16:54 ` [PULL 06/31] blockjob: report a better error message Kevin Wolf
2021-03-05 16:54 ` [PULL 07/31] storage-daemon: report unexpected arguments on the fly Kevin Wolf
2021-03-05 16:54 ` [PULL 08/31] storage-daemon: include current command line option in the errors Kevin Wolf
2021-03-05 16:54 ` [PULL 09/31] qemu-storage-daemon: add --pidfile option Kevin Wolf
2021-03-05 16:54 ` [PULL 10/31] docs: show how to spawn qemu-storage-daemon with fd passing Kevin Wolf
2021-03-05 16:54 ` [PULL 11/31] docs: replace insecure /tmp examples in qsd docs Kevin Wolf
2021-03-05 16:54 ` [PULL 12/31] vhost-user-blk: fix blkcfg->num_queues endianness Kevin Wolf
2021-03-05 16:54 ` [PULL 13/31] libqtest: add qtest_socket_server() Kevin Wolf
2021-03-05 16:54 ` [PULL 14/31] libqtest: add qtest_kill_qemu() Kevin Wolf
2021-03-05 16:54 ` [PULL 15/31] libqtest: add qtest_remove_abrt_handler() Kevin Wolf
2021-03-05 16:54 ` [PULL 16/31] test: new qTest case to test the vhost-user-blk-server Kevin Wolf
2021-03-05 16:54 ` [PULL 17/31] tests/qtest: add multi-queue test case to vhost-user-blk-test Kevin Wolf
2021-03-05 16:54 ` [PULL 18/31] block/export: fix blk_size double byteswap Kevin Wolf
2021-03-05 16:54 ` [PULL 19/31] block/export: use VIRTIO_BLK_SECTOR_BITS Kevin Wolf
2021-03-05 16:54 ` [PULL 20/31] block/export: fix vhost-user-blk export sector number calculation Kevin Wolf
2021-03-05 16:54 ` [PULL 21/31] block/export: port virtio-blk discard/write zeroes input validation Kevin Wolf
2021-03-05 16:54 ` [PULL 22/31] vhost-user-blk-test: test discard/write zeroes invalid inputs Kevin Wolf
2021-03-05 16:54 ` [PULL 23/31] block/export: port virtio-blk read/write range check Kevin Wolf
2021-03-05 16:54 ` [PULL 24/31] qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public Kevin Wolf
2021-03-05 16:54 ` [PULL 25/31] parallels.txt: fix bitmap L1 table description Kevin Wolf
2021-03-05 16:54 ` [PULL 26/31] block/parallels: BDRVParallelsState: add cluster_size field Kevin Wolf
2021-03-05 16:54 ` [PULL 27/31] parallels: support bitmap extension for read-only mode Kevin Wolf
2021-03-05 16:54 ` [PULL 28/31] iotests.py: add unarchive_sample_image() helper Kevin Wolf
2021-03-05 16:54 ` Kevin Wolf [this message]
2021-03-05 16:54 ` [PULL 30/31] MAINTAINERS: update parallels block driver Kevin Wolf
2021-03-05 16:54 ` [PULL 31/31] docs: qsd: Explain --export nbd,name=... default Kevin Wolf
2021-03-06 11:22 ` [PULL 00/31] Block layer patches Peter Maydell
2021-03-08 11:08 ` Kevin Wolf
2021-03-08 17:10 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210305165454.356840-30-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).