Qcow default cluster size is 4k, but default format of created overlay image on snapshot operation is qcow2 with it's default cluster of 64k.
This leads to block-dirty-bitmap-merge fail when test run for qcow format, as it can't merge bitmaps with different granularities. Let's fix it by specifying strict granularity. Reported-by: Max Reitz <mre...@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> --- tests/qemu-iotests/254 | 5 +++-- tests/qemu-iotests/254.out | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254 index 33cb80a512..a8ea5818ff 100755 --- a/tests/qemu-iotests/254 +++ b/tests/qemu-iotests/254 @@ -29,7 +29,8 @@ qemu_img_create('-f', iotests.imgfmt, disk, str(size)) vm = iotests.VM().add_drive(disk, opts='node-name=base') vm.launch() -vm.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0') +vm.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0', + granularity=65536) vm.hmp_qemu_io('drive0', 'write 0 512K') @@ -38,7 +39,7 @@ vm.qmp_log('transaction', indent=2, actions=[ 'data': {'device': 'drive0', 'snapshot-file': top, 'snapshot-node-name': 'snap'}}, {'type': 'block-dirty-bitmap-add', - 'data': {'node': 'snap', 'name': 'bitmap0'}}, + 'data': {'node': 'snap', 'name': 'bitmap0', 'granularity': 65536}}, {'type': 'block-dirty-bitmap-merge', 'data': {'node': 'snap', 'target': 'bitmap0', 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}} diff --git a/tests/qemu-iotests/254.out b/tests/qemu-iotests/254.out index d7394cf002..dc899016da 100644 --- a/tests/qemu-iotests/254.out +++ b/tests/qemu-iotests/254.out @@ -1,4 +1,4 @@ -{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "node": "drive0"}} +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap0", "node": "drive0"}} {"return": {}} { "execute": "transaction", @@ -14,6 +14,7 @@ }, { "data": { + "granularity": 65536, "name": "bitmap0", "node": "snap" }, -- 2.18.0