Merge pull request #2070 from menli820/bz_1785990_block_resize

block_resize: Cancel testing when resizing to 2T or 16T

qemu/tests/block_resize.py

@@ -158,6 +158,9 @@ def run(test, params, env):
             error_context.context("Extend disk to %s in guest"
                                   % block_size, logging.info)
             if os_type == 'windows':
+                max_block_size = int(params["max_block_size"])
+                if int(block_size) >= max_block_size:
+                    test.cancel("Cancel the test for more than maximum %dB disk." % max_block_size)
                 drive.extend_volume(session, mpoint)
             else:
                 utils_disk.resize_partition_linux(session, partition, str(block_size))

qemu/tests/cfg/block_hotplug.cfg

@@ -76,6 +76,9 @@
                 need_rescan = yes
                 disk_letter = I
                 disk_index = 1
+                max_block_size = 2199023255552
+                ovmf:
+                    max_block_size = 17592186044416
             virtio_scsi:
                 driver_name = vioscsi
             virtio_blk:

qemu/tests/cfg/block_resize.cfg

@@ -9,6 +9,10 @@
     disk_change_ratio = "${extend_ratio} ${shrink_ratio}"
     accept_ratio = 0.005
     md5_file = md5.dat
+    Windows:
+        max_block_size = 2199023255552
+        ovmf:
+            max_block_size = 17592186044416
     iozone_path = "WIN_UTILS:\Iozone\iozone.exe"
     iozone_option = " -azR -r 64k -n 512M -g 1G -M -I -i 0 -i 1 -b iozone.xls -f %s:\testfile"
     dd_cmd = "dd if=/dev/urandom of=%s oflag=direct bs=1M count=10"