Skip to contentSkip to conversation

vpc: Return 0 from vpc_co_create() on success

PATCH Applied Max Reitz 2 participants 7 messages Sep 2, 2019 – Sep 3, 2019 Block layer

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

v2 cover vpc: Return 0 from vpc_co_create() on success

(v2 for “block: Let blockdev-create return 0 on success”)

Jobs are expected to return 0 on success, so this extends to .bdrv_co_create(). After some inspection, it turns out that vpc is the only block driver that may return a positive value instead (to indicate success). Fix that.

Without this patch, blockdev-create is likely to fail for VPC images. Hence patch 5.

John indicated his preference for me to use iotests.script_main(). I did that; but I still wanted to retain some form of verify_protocol(). Patch 2 adds @supported_protocols to execute_test() (and thus to iotests.script_main() and iotests.main()). Then I noticed we should probably make all Python tests (that use either script_main() or main()) pass something for that parameter, because it’s a bit silly to run all Python tests for raw when you just want to run the nbd tests (which are five or so). Enter patches 3 and 4.

(There are two Python tests (093 and 136) which I didn’t change to pass supported_protocols, because they use null-{co,aio} as their protocol. As these are not actually testee protocols for the iotests, I decided to just keep running these tests for any protocol.)

For completeness’ sake[1]:

git-backport-diff against v1:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/5:[down] 'vpc: Return 0 from vpc_co_create() on success' 002/5:[down] 'iotests: Add supported protocols to execute_test()' 003/5:[down] 'iotests: Restrict file Python tests to file' 004/5:[down] 'iotests: Restrict nbd Python tests to nbd' 005/5:[0204] [FC] 'iotests: Test blockdev-create for vpc'

[1]
Please vote on the correct spelling:
(A) “For completeness sake”
(B) “For completeness’ sake”
(C) “For completeness’s sake”

By participating, you become eligible to receive mention in the git log.

To give you mention, we need your full name and email address. Therefore, please cast your vote by replying to this mail as follows:

Quoted 3 lines

I vote for ${letter}${reason:=.}

Reviewed-by $name <$email_address>

(Set the “letter” variable to be any of A, B, or C; “reason” to be a justification (optional; should be prefixed by “, because ” and end with a full stop); “name” to be your name; and “email_address” to be your email address.)

Thank you for doing your part in saving democracy!

Max Reitz (5):
vpc: Return 0 from vpc_co_create() on success
iotests: Add supported protocols to execute_test()
iotests: Restrict file Python tests to file
iotests: Restrict nbd Python tests to nbd
iotests: Test blockdev-create for vpc

 block/vpc.c                   |   3 +-
 tests/qemu-iotests/030        |   3 +-
 tests/qemu-iotests/040        |   3 +-
 tests/qemu-iotests/041        |   3 +-
 tests/qemu-iotests/044        |   3 +-
 tests/qemu-iotests/045        |   3 +-
 tests/qemu-iotests/055        |   3 +-
 tests/qemu-iotests/056        |   3 +-
 tests/qemu-iotests/057        |   3 +-
 tests/qemu-iotests/065        |   3 +-
 tests/qemu-iotests/096        |   3 +-
 tests/qemu-iotests/118        |   3 +-
 tests/qemu-iotests/124        |   3 +-
 tests/qemu-iotests/129        |   3 +-
 tests/qemu-iotests/132        |   3 +-
 tests/qemu-iotests/139        |   3 +-
 tests/qemu-iotests/147        |   5 +-
 tests/qemu-iotests/148        |   3 +-
 tests/qemu-iotests/151        |   3 +-
 tests/qemu-iotests/152        |   3 +-
 tests/qemu-iotests/155        |   3 +-
 tests/qemu-iotests/163        |   3 +-
 tests/qemu-iotests/165        |   3 +-
 tests/qemu-iotests/169        |   3 +-
 tests/qemu-iotests/196        |   3 +-
 tests/qemu-iotests/199        |   3 +-
 tests/qemu-iotests/205        |   3 +-
 tests/qemu-iotests/245        |   3 +-
 tests/qemu-iotests/257        |   3 +-
 tests/qemu-iotests/266        | 153 ++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/266.out    | 137 ++++++++++++++++++++++++++++++
 tests/qemu-iotests/group      |   1 +
 tests/qemu-iotests/iotests.py |   4 +-
 33 files changed, 352 insertions(+), 32 deletions(-)
 create mode 100755 tests/qemu-iotests/266
 create mode 100644 tests/qemu-iotests/266.out
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH v2 1/5 vpc: Return 0 from vpc_co_create() on success

blockdev_create_run() directly uses .bdrv_co_create()'s return value as the job's return value. Jobs must return 0 on success, not just any nonnegative value. Therefore, using blockdev-create for VPC images may currently fail as the vpc driver may return a positive integer.

Because there is no point in returning a positive integer anywhere in the block layer (all non-negative integers are generally treated as complete success), we probably do not want to add more such cases. Therefore, fix this problem by making the vpc driver always return 0 in case of success.

---
 block/vpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
block/vpc.c +2 -1
index b25aab0425..5cd3890780 100644
@@ -885,6 +885,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf,
         goto fail;
     }
 
+    ret = 0;
  fail:
     return ret;
 }
@@ -908,7 +909,7 @@ static int create_fixed_disk(BlockBackend *blk, uint8_t *buf,
         return ret;
     }
 
-    return ret;
+    return 0;
 }
 
 static int calculate_rounded_image_size(BlockdevCreateOptionsVpc *vpc_opts,
Signature · 1 line
2.21.0
author
#2 lore raw

PATCH v2 2/5 iotests: Add supported protocols to execute_test()

In reply to Max Reitz
---
 tests/qemu-iotests/iotests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/qemu-iotests/iotests.py +3 -1
index 84438e837c..b26271187c 100644
@@ -909,7 +909,8 @@ def execute_unittest(output, verbosity, debug):
 
 def execute_test(test_function=None,
                  supported_fmts=[], supported_oses=['linux'],
-                 supported_cache_modes=[], unsupported_fmts=[]):
+                 supported_cache_modes=[], unsupported_fmts=[],
+                 supported_protocols=[], unsupported_protocols=[]):
     """Run either unittest or script-style tests."""
 
     # We are using TEST_DIR and QEMU_DEFAULT_MACHINE as proxies to
@@ -923,6 +924,7 @@ def execute_test(test_function=None,
     debug = '-d' in sys.argv
     verbosity = 1
     verify_image_format(supported_fmts, unsupported_fmts)
+    verify_protocol(supported_protocols, unsupported_protocols)
     verify_platform(supported_oses)
     verify_cache_mode(supported_cache_modes)
 
Signature · 1 line
2.21.0
author
#3 lore raw

PATCH v2 3/5 iotests: Restrict file Python tests to file

In reply to Max Reitz

Most of our Python unittest-style tests only support the file protocol. You can run them with any other protocol, but the test will simply ignore your choice and use file anyway.

We should let them signal that they require the file protocol so they are skipped when you want to test some other protocol.

---
 tests/qemu-iotests/030 | 3 ++-
 tests/qemu-iotests/040 | 3 ++-
 tests/qemu-iotests/041 | 3 ++-
 tests/qemu-iotests/044 | 3 ++-
 tests/qemu-iotests/045 | 3 ++-
 tests/qemu-iotests/055 | 3 ++-
 tests/qemu-iotests/056 | 3 ++-
 tests/qemu-iotests/057 | 3 ++-
 tests/qemu-iotests/065 | 3 ++-
 tests/qemu-iotests/096 | 3 ++-
 tests/qemu-iotests/118 | 3 ++-
 tests/qemu-iotests/124 | 3 ++-
 tests/qemu-iotests/129 | 3 ++-
 tests/qemu-iotests/132 | 3 ++-
 tests/qemu-iotests/139 | 3 ++-
 tests/qemu-iotests/148 | 3 ++-
 tests/qemu-iotests/151 | 3 ++-
 tests/qemu-iotests/152 | 3 ++-
 tests/qemu-iotests/155 | 3 ++-
 tests/qemu-iotests/163 | 3 ++-
 tests/qemu-iotests/165 | 3 ++-
 tests/qemu-iotests/169 | 3 ++-
 tests/qemu-iotests/196 | 3 ++-
 tests/qemu-iotests/199 | 3 ++-
 tests/qemu-iotests/245 | 3 ++-
 tests/qemu-iotests/257 | 3 ++-
 26 files changed, 52 insertions(+), 26 deletions(-)
tests/qemu-iotests/030 +2 -1
index 1b69f318c6..f3766f2a81 100755
@@ -957,4 +957,5 @@ class TestSetSpeed(iotests.QMPTestCase):
         self.cancel_and_wait(resume=True)
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2', 'qed'])
+    iotests.main(supported_fmts=['qcow2', 'qed'],
+                 supported_protocols=['file'])
tests/qemu-iotests/040 +2 -1
index 6db9abf8e6..762ad1ebcb 100755
@@ -429,4 +429,5 @@ class TestReopenOverlay(ImageCommitTestCase):
         self.run_commit_test(self.img1, self.img0)
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2', 'qed'])
+    iotests.main(supported_fmts=['qcow2', 'qed'],
+                 supported_protocols=['file'])
tests/qemu-iotests/041 +2 -1
index 8bc8f81db7..8568426311 100755
@@ -1122,4 +1122,5 @@ class TestOrphanedSource(iotests.QMPTestCase):
         self.assert_qmp(result, 'error/class', 'GenericError')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2', 'qed'])
+    iotests.main(supported_fmts=['qcow2', 'qed'],
+                 supported_protocols=['file'])
tests/qemu-iotests/044 +2 -1
index 9ec3dba734..05ea1f49c5 100755
@@ -118,4 +118,5 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
         pass
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/045 +2 -1
index d5484a0ee1..01cc038884 100755
@@ -175,4 +175,5 @@ class TestSCMFd(iotests.QMPTestCase):
             "File descriptor named '%s' not found" % fdname)
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['raw'])
+    iotests.main(supported_fmts=['raw'],
+                 supported_protocols=['file'])
tests/qemu-iotests/055 +2 -1
index 3437c11507..c732a112d6 100755
@@ -563,4 +563,5 @@ class TestDriveCompression(iotests.QMPTestCase):
                                         target='drive1')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['raw', 'qcow2'])
+    iotests.main(supported_fmts=['raw', 'qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/056 +2 -1
index e761e465ae..98c55d8e5a 100755
@@ -335,4 +335,5 @@ class BackupTest(iotests.QMPTestCase):
         self.dismissal_failure(True)
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2', 'qed'])
+    iotests.main(supported_fmts=['qcow2', 'qed'],
+                 supported_protocols=['file'])
tests/qemu-iotests/057 +2 -1
index 9f0a5a3057..9fbba759b6 100755
@@ -256,4 +256,5 @@ class TestSnapshotDelete(ImageSnapshotTestCase):
         self.assert_qmp(result, 'error/class', 'GenericError')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/065 +2 -1
index 8bac383ea7..5b21eb96bd 100755
@@ -129,4 +129,5 @@ TestQemuImgInfo = None
 TestQMP = None
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/096 +2 -1
index a69439602d..ab9cb47822 100755
@@ -67,4 +67,5 @@ class TestLiveSnapshot(iotests.QMPTestCase):
         self.checkConfig('target')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/118 +2 -1
index 6f45779ee9..ea0b326ae0 100755
@@ -717,4 +717,5 @@ if __name__ == '__main__':
                        iotests.qemu_default_machine)
     # Need to support image creation
     iotests.main(supported_fmts=['vpc', 'parallels', 'qcow', 'vdi', 'qcow2',
-                                 'vmdk', 'raw', 'vhdx', 'qed'])
+                                 'vmdk', 'raw', 'vhdx', 'qed'],
+                 supported_protocols=['file'])
tests/qemu-iotests/124 +2 -1
index 3440f54781..ca40ba3be2 100755
@@ -779,4 +779,5 @@ class TestIncrementalBackupBlkdebug(TestIncrementalBackupBase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/129 +2 -1
index 9e87e1c8d9..cd6b9e9ce7 100755
@@ -83,4 +83,5 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
         self.do_test_stop("block-commit", device="drive0")
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=["qcow2"])
+    iotests.main(supported_fmts=["qcow2"],
+                 supported_protocols=["file"])
tests/qemu-iotests/132 +2 -1
index f53ef6e391..0f2a106c81 100755
@@ -56,4 +56,5 @@ class TestSingleDrive(iotests.QMPTestCase):
                         'target image does not match source after mirroring')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['raw', 'qcow2'])
+    iotests.main(supported_fmts=['raw', 'qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/139 +2 -1
index 2176ea51ba..cbb5a76530 100755
@@ -358,4 +358,5 @@ class TestBlockdevDel(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=["qcow2"])
+    iotests.main(supported_fmts=["qcow2"],
+                 supported_protocols=["file"])
tests/qemu-iotests/148 +2 -1
index e01b061fe7..8c11c53cba 100755
@@ -137,4 +137,5 @@ class TestFifoQuorumEvents(TestQuorumEvents):
 
 if __name__ == '__main__':
     iotests.verify_quorum()
-    iotests.main(supported_fmts=["raw"])
+    iotests.main(supported_fmts=["raw"],
+                 supported_protocols=["file"])
tests/qemu-iotests/151 +2 -1
index ad7359fc8d..76ae265cc1 100755
@@ -142,4 +142,5 @@ class TestActiveMirror(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2', 'raw'])
+    iotests.main(supported_fmts=['qcow2', 'raw'],
+                 supported_protocols=['file'])
tests/qemu-iotests/152 +2 -1
index fec546d033..732bf5f062 100755
@@ -59,4 +59,5 @@ class TestUnaligned(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['raw', 'qcow2'])
+    iotests.main(supported_fmts=['raw', 'qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/155 +2 -1
index 63a5b5e2c0..e19485911c 100755
@@ -258,4 +258,5 @@ BaseClass = None
 MirrorBaseClass = None
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/163 +2 -1
index 158ba5d092..081ccc8ac1 100755
@@ -170,4 +170,5 @@ class TestShrink1M(ShrinkBaseClass):
 ShrinkBaseClass = None
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['raw', 'qcow2'])
+    iotests.main(supported_fmts=['raw', 'qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/165 +2 -1
index 88f62d3c6d..5650dc7c87 100755
@@ -103,4 +103,5 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):
         self.vm.shutdown()
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/169 +2 -1
index 7e06cc1145..8c204caf20 100755
@@ -227,4 +227,5 @@ for cmb in list(itertools.product((True, False), repeat=2)):
                      'do_test_migration_resume_source', *list(cmb))
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/196 +2 -1
index 4116ebc92b..92fe9244f8 100755
@@ -63,4 +63,5 @@ class TestInvalidateAutoclear(iotests.QMPTestCase):
             self.assertEqual(f.read(1), b'\x00')
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'])
+    iotests.main(supported_fmts=['qcow2'],
+                 supported_protocols=['file'])
tests/qemu-iotests/199 +2 -1
index 651e8df5d9..a2c8ecab5a 100755
@@ -115,4 +115,5 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
         self.assert_qmp(result, 'return/sha256', sha256);
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['qcow2'], supported_cache_modes=['none'])
+    iotests.main(supported_fmts=['qcow2'], supported_cache_modes=['none'],
+                 supported_protocols=['file'])
tests/qemu-iotests/245 +2 -1
index bc1ceb9792..41218d5f1d 100644
@@ -1000,4 +1000,5 @@ class TestBlockdevReopen(iotests.QMPTestCase):
         self.reopen(opts, {'backing': 'hd2'})
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=["qcow2"])
+    iotests.main(supported_fmts=["qcow2"],
+                 supported_protocols=["file"])
tests/qemu-iotests/257 +2 -1
index c2a72c577a..4a636d8ab2 100755
@@ -557,4 +557,5 @@ def main():
     test_backup_api()
 
 if __name__ == '__main__':
-    iotests.script_main(main, supported_fmts=['qcow2'])
+    iotests.script_main(main, supported_fmts=['qcow2'],
+                        supported_protocols=['file'])
Signature · 1 line
2.21.0
author
#4 lore raw

PATCH v2 4/5 iotests: Restrict nbd Python tests to nbd

In reply to Max Reitz

We have two Python unittest-style tests that test NBD. As such, they should specify supported_protocols=['nbd'] so they are skipped when the user wants to test some other protocol.

Furthermore, we should restrict their choice of formats to 'raw'. The idea of a protocol/format combination is to use some format over some protocol; but we always use the raw format over NBD. It does not really matter what the NBD server uses on its end, and it is not a useful test of the respective format driver anyway.

---
 tests/qemu-iotests/147 | 5 ++---
 tests/qemu-iotests/205 | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
tests/qemu-iotests/147 +2 -3
index 2d84fddb01..ab8480b9a4 100755
@@ -287,6 +287,5 @@ class BuiltinNBD(NBDBlockdevAddBase):
 
 
 if __name__ == '__main__':
-    # Need to support image creation
-    iotests.main(supported_fmts=['vpc', 'parallels', 'qcow', 'vdi', 'qcow2',
-                                 'vmdk', 'raw', 'vhdx', 'qed'])
+    iotests.main(supported_fmts=['raw'],
+                 supported_protocols=['nbd'])
tests/qemu-iotests/205 +2 -1
index b8a86c446e..76f6c5fa2b 100755
@@ -153,4 +153,5 @@ class TestNbdServerRemove(iotests.QMPTestCase):
 
 
 if __name__ == '__main__':
-    iotests.main(supported_fmts=['generic'])
+    iotests.main(supported_fmts=['raw'],
+                 supported_protocols=['nbd'])
Signature · 1 line
2.21.0
author
#5 lore raw

PATCH v2 5/5 iotests: Test blockdev-create for vpc

In reply to Max Reitz
---
 tests/qemu-iotests/266     | 153 +++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/266.out | 137 +++++++++++++++++++++++++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 291 insertions(+)
 create mode 100755 tests/qemu-iotests/266
 create mode 100644 tests/qemu-iotests/266.out
tests/qemu-iotests/266 new file +153 -0
new file mode 100755
index 0000000000..5b35cd67e4
@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+#
+# Test VPC and file image creation
+#
+# Copyright (C) 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
+# 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 iotests
+from iotests import imgfmt
+
+
+def blockdev_create(vm, options):
+    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
+                        filters=[iotests.filter_qmp_testfiles])
+
+    if 'return' in result:
+        assert result['return'] == {}
+        vm.run_job('job0')
+
+
+# Successful image creation (defaults)
+def implicit_defaults(vm, file_path):
+    iotests.log("=== Successful image creation (defaults) ===")
+    iotests.log("")
+
+    # 8 heads, 964 cyls/head, 17 secs/cyl
+    # (Close to 64 MB)
+    size = 8 * 964 * 17 * 512
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': size })
+
+
+# Successful image creation (explicit defaults)
+def explicit_defaults(vm, file_path):
+    iotests.log("=== Successful image creation (explicit defaults) ===")
+    iotests.log("")
+
+    # 16 heads, 964 cyls/head, 17 secs/cyl
+    # (Close to 128 MB)
+    size = 16 * 964 * 17 * 512
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': size,
+                          'subformat': 'dynamic',
+                          'force-size': False })
+
+
+# Successful image creation (non-default options)
+def non_defaults(vm, file_path):
+    iotests.log("=== Successful image creation (non-default options) ===")
+    iotests.log("")
+
+    # Not representable in CHS (fine with force-size=True)
+    size = 1048576
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': size,
+                          'subformat': 'fixed',
+                          'force-size': True })
+
+
+# Size not representable in CHS with force-size=False
+def non_chs_size_without_force(vm, file_path):
+    iotests.log("=== Size not representable in CHS ===")
+    iotests.log("")
+
+    # Not representable in CHS (will not work with force-size=False)
+    size = 1048576
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': size,
+                          'force-size': False })
+
+
+# Zero size
+def zero_size(vm, file_path):
+    iotests.log("=== Zero size===")
+    iotests.log("")
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': 0 })
+
+
+# Maximum CHS size
+def maximum_chs_size(vm, file_path):
+    iotests.log("=== Maximum CHS size===")
+    iotests.log("")
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': 16 * 65535 * 255 * 512 })
+
+
+# Actual maximum size
+def maximum_size(vm, file_path):
+    iotests.log("=== Actual maximum size===")
+    iotests.log("")
+
+    blockdev_create(vm, { 'driver': imgfmt,
+                          'file': 'protocol-node',
+                          'size': 0xff000000 * 512,
+                          'force-size': True })
+
+
+def main():
+    for test_func in [implicit_defaults, explicit_defaults, non_defaults,
+                      non_chs_size_without_force, zero_size, maximum_chs_size,
+                      maximum_size]:
+
+        with iotests.FilePath('t.vpc') as file_path, \
+             iotests.VM() as vm:
+
+            vm.launch()
+
+            iotests.log('--- Creating empty file ---')
+            blockdev_create(vm, { 'driver': 'file',
+                                  'filename': file_path,
+                                  'size': 0 })
+
+            vm.qmp_log('blockdev-add', driver='file', filename=file_path,
+                       node_name='protocol-node',
+                       filters=[iotests.filter_qmp_testfiles])
+            iotests.log('')
+
+            print_info = test_func(vm, file_path)
+            iotests.log('')
+
+            vm.shutdown()
+            iotests.img_info_log(file_path)
+
+
+iotests.script_main(main,
+                    supported_fmts=['vpc'],
+                    supported_protocols=['file'])
tests/qemu-iotests/266.out new file +137 -0

137 lines not on this page · raw message

tests/qemu-iotests/group +1 -0
index d95d556414..8b96456278 100644
@@ -274,3 +274,4 @@
 257 rw
 258 rw quick
 262 rw quick migration
+266 rw quick
Signature · 1 line
2.21.0
Applied
#6 lore raw
In reply to Max Reitz

Am 02.09.2019 um 21:33 hat Max Reitz geschrieben:

Quoted 19 lines

(v2 for “block: Let blockdev-create return 0 on success”)

Jobs are expected to return 0 on success, so this extends to .bdrv_co_create(). After some inspection, it turns out that vpc is the only block driver that may return a positive value instead (to indicate success). Fix that.

Without this patch, blockdev-create is likely to fail for VPC images. Hence patch 5.

John indicated his preference for me to use iotests.script_main(). I did that; but I still wanted to retain some form of verify_protocol(). Patch 2 adds @supported_protocols to execute_test() (and thus to iotests.script_main() and iotests.main()). Then I noticed we should probably make all Python tests (that use either script_main() or main()) pass something for that parameter, because it’s a bit silly to run all Python tests for raw when you just want to run the nbd tests (which are five or so). Enter patches 3 and 4.

Quoted 4 lines

(There are two Python tests (093 and 136) which I didn’t change to pass supported_protocols, because they use null-{co,aio} as their protocol. As these are not actually testee protocols for the iotests, I decided to just keep running these tests for any protocol.)

Thanks, applied to the block branch.