From 6f5c54a54c05143cf9f69a626b398886d1c51358 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Fri, 30 Aug 2019 12:56:25 +0100

Subject: [PATCH 07/10] iotests: Tweak 221 sizing for different hole

 granularities

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <20190830125628.23668-3-thuth@redhat.com>

Patchwork-id: 90213

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 2/5] iotests: Tweak 221 sizing for different hole granularities

Bugzilla: 1738839

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

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

RH-Acked-by: David Hildenbrand <david@redhat.com>

From: Eric Blake <eblake@redhat.com>

For some particular configurations of ext4, sizing an image to 84

sectors + 1 byte causes test failures when the size of the hole is

rounded to a 4k alignment. Let's instead size things to 128 sectors +

1 byte, as the 64k boundary is more likely to work with various hole

granularities.

Reported-by: Thomas Huth <thuth@redhat.com>

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

Message-Id: <20190506172111.31594-1-eblake@redhat.com>

Tested-by: Thomas Huth <thuth@redhat.com>

(cherry picked from commit d3192de752cd6d383d38e50341b39d9550d21fa8)

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

---

 tests/qemu-iotests/221     | 10 +++++-----

 tests/qemu-iotests/221.out | 20 ++++++++++----------

 2 files changed, 15 insertions(+), 15 deletions(-)

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

index 2cc29ba..75aa192 100755

--- a/tests/qemu-iotests/221

+++ b/tests/qemu-iotests/221

@@ -3,7 +3,7 @@

 # Test qemu-img vs. unaligned images

 # (See also 253, which is the O_DIRECT version)

 #

-# Copyright (C) 2018 Red Hat, Inc.

+# Copyright (C) 2018-2019 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

@@ -46,16 +46,16 @@ echo

 echo "=== Check mapping of unaligned raw image ==="

 echo

-_make_test_img 43009 # qemu-img create rounds size up

+_make_test_img 65537 # qemu-img create rounds size up

 $QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map

-truncate --size=43009 "$TEST_IMG" # so we resize it and check again

+truncate --size=65537 "$TEST_IMG" # so we resize it and check again

 $QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map

-$QEMU_IO -c 'w 43008 1' "$TEST_IMG" | _filter_qemu_io # writing also rounds up

+$QEMU_IO -c 'w 65536 1' "$TEST_IMG" | _filter_qemu_io # writing also rounds up

 $QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map

-truncate --size=43009 "$TEST_IMG" # so we resize it and check again

+truncate --size=65537 "$TEST_IMG" # so we resize it and check again

 $QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map

 # success, all done

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

index a9c0190..9f9dd52 100644

--- a/tests/qemu-iotests/221.out

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

@@ -2,15 +2,15 @@ QA output created by 221

 === Check mapping of unaligned raw image ===

-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=43009

-[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

-[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

-wrote 1/1 bytes at offset 43008

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

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

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

+wrote 1/1 bytes at offset 65536

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

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

-{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

-{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

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

-{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},

-{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]

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

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

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

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

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

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

 *** done

-- 

1.8.3.1