On 8/23/19 2:47 PM, Max Reitz wrote: > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > tests/qemu-iotests/266 | 182 +++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/266.out | 107 ++++++++++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 290 insertions(+) > create mode 100755 tests/qemu-iotests/266 > create mode 100644 tests/qemu-iotests/266.out > > diff --git a/tests/qemu-iotests/266 b/tests/qemu-iotests/266 > new file mode 100755 > index 0000000000..19b7b29535 > --- /dev/null > +++ b/tests/qemu-iotests/266 > @@ -0,0 +1,182 @@ > +#!/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 > + > +iotests.verify_image_format(supported_fmts=['vpc']) > +iotests.verify_protocol(supported=['file']) > + Oh, I guess I haven't successfully lobbied for the inclusion of the other thing yet. oh-kay. > +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') > + iotests.log("") > + Probably approaching the time when we want a standard for this in iotests, but I'm not insisting today. > +with iotests.FilePath('t.vpc') as disk_path, \ > + iotests.VM() as vm: > + > + # > + # Successful image creation (defaults) > + # > + 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 > + > + vm.launch() > + blockdev_create(vm, { 'driver': 'file', > + 'filename': disk_path, > + 'size': 0 }) > + > + vm.qmp_log('blockdev-add', driver='file', filename=disk_path, > + node_name='imgfile', filters=[iotests.filter_qmp_testfiles]) > + > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'imgfile', > + 'size': size }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > + > + # > + # Successful image creation (explicit defaults) > + # > + 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 > + > + vm.launch() > + blockdev_create(vm, { 'driver': 'file', > + 'filename': disk_path, > + 'size': 0 }) > + > + vm.qmp_log('blockdev-add', driver='file', filename=disk_path, > + node_name='imgfile', filters=[iotests.filter_qmp_testfiles]) > + > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'imgfile', > + 'size': size, > + 'subformat': 'dynamic', > + 'force-size': False }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > + > + # > + # Successful image creation (non-default options) > + # > + iotests.log("=== Successful image creation (non-default options) ===") > + iotests.log("") > + > + # Not representable in CHS (fine with force-size=True) > + size = 1048576 > + > + vm.launch() > + blockdev_create(vm, { 'driver': 'file', > + 'filename': disk_path, > + 'size': 0 }) > + > + vm.qmp_log('blockdev-add', driver='file', filename=disk_path, > + node_name='imgfile', filters=[iotests.filter_qmp_testfiles]) > + > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'imgfile', > + 'size': size, > + 'subformat': 'fixed', > + 'force-size': True }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > + > + # > + # Size not representable in CHS with force-size=False > + # > + iotests.log("=== Size not representable in CHS ===") > + iotests.log("") > + > + # Not representable in CHS (will not work with force-size=False) > + size = 1048576 > + > + vm.launch() > + blockdev_create(vm, { 'driver': 'file', > + 'filename': disk_path, > + 'size': 0 }) > + > + vm.qmp_log('blockdev-add', driver='file', filename=disk_path, > + node_name='imgfile', filters=[iotests.filter_qmp_testfiles]) > + > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'imgfile', > + 'size': size, > + 'force-size': False }) > + vm.shutdown() > + > + # > + # Zero size > + # > + iotests.log("=== Zero size===") > + iotests.log("") > + > + vm.add_blockdev('driver=file,filename=%s,node-name=node0' % (disk_path)) > + vm.launch() > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'node0', > + 'size': 0 }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > + > + # > + # Maximum CHS size > + # > + iotests.log("=== Maximum CHS size===") > + iotests.log("") > + > + vm.launch() > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'node0', > + 'size': 16 * 65535 * 255 * 512 }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > + > + # > + # Actual maximum size > + # > + iotests.log("=== Actual maximum size===") > + iotests.log("") > + > + vm.launch() > + blockdev_create(vm, { 'driver': imgfmt, > + 'file': 'node0', > + 'size': 0xff000000 * 512, > + 'force-size': True }) > + vm.shutdown() > + > + iotests.img_info_log(disk_path) > diff --git a/tests/qemu-iotests/266.out b/tests/qemu-iotests/266.out > new file mode 100644 > index 0000000000..43244a4574 > --- /dev/null > +++ b/tests/qemu-iotests/266.out > @@ -0,0 +1,107 @@ > +=== Successful image creation (defaults) === > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "size": 0}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": > "TEST_DIR/PID-t.vpc", "node-name": "imgfile"}} > +{"return": {}} > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "imgfile", "size": 67125248}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 64 MiB (67125248 bytes) > +cluster_size: 2097152 > + > +=== Successful image creation (explicit defaults) === > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "size": 0}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": > "TEST_DIR/PID-t.vpc", "node-name": "imgfile"}} > +{"return": {}} > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "imgfile", "force-size": false, "size": 134250496, > "subformat": "dynamic"}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 128 MiB (134250496 bytes) > +cluster_size: 2097152 > + > +=== Successful image creation (non-default options) === > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "size": 0}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": > "TEST_DIR/PID-t.vpc", "node-name": "imgfile"}} > +{"return": {}} > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "imgfile", "force-size": true, "size": 1048576, > "subformat": "fixed"}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 1 MiB (1048576 bytes) > + > +=== Size not representable in CHS === > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "file", "filename": "TEST_DIR/PID-t.vpc", "size": 0}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +{"execute": "blockdev-add", "arguments": {"driver": "file", "filename": > "TEST_DIR/PID-t.vpc", "node-name": "imgfile"}} > +{"return": {}} > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "imgfile", "force-size": false, "size": 1048576}}} > +{"return": {}} > +Job failed: The requested image size cannot be represented in CHS geometry > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +=== Zero size=== > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "node0", "size": 0}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 0 B (0 bytes) > +cluster_size: 2097152 > + > +=== Maximum CHS size=== > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "node0", "size": 136899993600}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 127 GiB (136899993600 bytes) > +cluster_size: 2097152 > + > +=== Actual maximum size=== > + > +{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": > {"driver": "vpc", "file": "node0", "force-size": true, "size": > 2190433320960}}} > +{"return": {}} > +{"execute": "job-dismiss", "arguments": {"id": "job0"}} > +{"return": {}} > + > +image: TEST_IMG > +file format: IMGFMT > +virtual size: 1.99 TiB (2190433320960 bytes) > +cluster_size: 2097152 > + > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index d95d556414..8b96456278 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -274,3 +274,4 @@ > 257 rw > 258 rw quick > 262 rw quick migration > +266 rw quick >
