diff options
| -rw-r--r-- | include/block/block_int.h | 31 | ||||
| -rw-r--r-- | scripts/qemu.py | 16 | ||||
| -rwxr-xr-x | tests/qemu-iotests/194 | 103 | ||||
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 26 |
4 files changed, 123 insertions, 53 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 7571c0aaaf..7816b43a27 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -146,12 +146,43 @@ struct BlockDriver { int coroutine_fn (*bdrv_co_readv)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); + + /** + * @offset: position in bytes to read at + * @bytes: number of bytes to read + * @qiov: the buffers to fill with read data + * @flags: currently unused, always 0 + * + * @offset and @bytes will be a multiple of 'request_alignment', + * but the length of individual @qiov elements does not have to + * be a multiple. + * + * @bytes will always equal the total size of @qiov, and will be + * no larger than 'max_transfer'. + * + * The buffer in @qiov may point directly to guest memory. + */ int coroutine_fn (*bdrv_co_preadv)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags); int coroutine_fn (*bdrv_co_writev)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); int coroutine_fn (*bdrv_co_writev_flags)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov, int flags); + /** + * @offset: position in bytes to write at + * @bytes: number of bytes to write + * @qiov: the buffers containing data to write + * @flags: zero or more bits allowed by 'supported_write_flags' + * + * @offset and @bytes will be a multiple of 'request_alignment', + * but the length of individual @qiov elements does not have to + * be a multiple. + * + * @bytes will always equal the total size of @qiov, and will be + * no larger than 'max_transfer'. + * + * The buffer in @qiov may point directly to guest memory. + */ int coroutine_fn (*bdrv_co_pwritev)(BlockDriverState *bs, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags); diff --git a/scripts/qemu.py b/scripts/qemu.py index 880e3e8219..4d8ee10943 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -21,7 +21,14 @@ import qmp.qmp class QEMUMachine(object): - '''A QEMU VM''' + '''A QEMU VM + + Use this object as a context manager to ensure the QEMU process terminates:: + + with VM(binary) as vm: + ... + # vm is guaranteed to be shut down here + ''' def __init__(self, binary, args=[], wrapper=[], name=None, test_dir="/var/tmp", monitor_address=None, socket_scm_helper=None, debug=False): @@ -40,6 +47,13 @@ class QEMUMachine(object): self._socket_scm_helper = socket_scm_helper self._debug = debug + def __enter__(self): + return self + + def __exit__(self, exc_type, exc_val, exc_tb): + self.shutdown() + return False + # This can be used to add an unused monitor instance. def add_monitor_telnet(self, ip, port): args = 'tcp:%s:%d,server,nowait,telnet' % (ip, port) diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index a3e3bad664..6449b9b64a 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -19,66 +19,65 @@ # # Non-shared storage migration test using NBD server and drive-mirror -import os -import atexit import iotests iotests.verify_platform(['linux']) -img_size = '1G' -source_img_path = os.path.join(iotests.test_dir, 'source.img') -dest_img_path = os.path.join(iotests.test_dir, 'dest.img') -iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path, img_size) -iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path, img_size) +with iotests.FilePath('source.img') as source_img_path, \ + iotests.FilePath('dest.img') as dest_img_path, \ + iotests.FilePath('migration.sock') as migration_sock_path, \ + iotests.FilePath('nbd.sock') as nbd_sock_path, \ + iotests.VM('source') as source_vm, \ + iotests.VM('dest') as dest_vm: -iotests.log('Launching VMs...') -migration_sock_path = os.path.join(iotests.test_dir, 'migration.sock') -nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock') -source_vm = iotests.VM('source').add_drive(source_img_path) -dest_vm = (iotests.VM('dest').add_drive(dest_img_path) - .add_incoming('unix:{0}'.format(migration_sock_path))) -source_vm.launch() -atexit.register(source_vm.shutdown) -dest_vm.launch() -atexit.register(dest_vm.shutdown) + img_size = '1G' + iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, source_img_path, img_size) + iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, dest_img_path, img_size) -iotests.log('Launching NBD server on destination...') -iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data': {'path': nbd_sock_path}})) -iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True)) + iotests.log('Launching VMs...') + (source_vm.add_drive(source_img_path) + .launch()) + (dest_vm.add_drive(dest_img_path) + .add_incoming('unix:{0}'.format(migration_sock_path)) + .launch()) -iotests.log('Starting `drive-mirror` on source...') -iotests.log(source_vm.qmp( - 'drive-mirror', - device='drive0', - target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path), - sync='full', - format='raw', # always raw, the server handles the format - mode='existing', - job_id='mirror-job0')) + iotests.log('Launching NBD server on destination...') + iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data': {'path': nbd_sock_path}})) + iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True)) -iotests.log('Waiting for `drive-mirror` to complete...') -iotests.log(source_vm.event_wait('BLOCK_JOB_READY'), - filters=[iotests.filter_qmp_event]) + iotests.log('Starting `drive-mirror` on source...') + iotests.log(source_vm.qmp( + 'drive-mirror', + device='drive0', + target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path), + sync='full', + format='raw', # always raw, the server handles the format + mode='existing', + job_id='mirror-job0')) -iotests.log('Starting migration...') -source_vm.qmp('migrate-set-capabilities', - capabilities=[{'capability': 'events', 'state': True}]) -dest_vm.qmp('migrate-set-capabilities', - capabilities=[{'capability': 'events', 'state': True}]) -iotests.log(source_vm.qmp('migrate', uri='unix:{0}'.format(migration_sock_path))) + iotests.log('Waiting for `drive-mirror` to complete...') + iotests.log(source_vm.event_wait('BLOCK_JOB_READY'), + filters=[iotests.filter_qmp_event]) -while True: - event1 = source_vm.event_wait('MIGRATION') - iotests.log(event1, filters=[iotests.filter_qmp_event]) - if event1['data']['status'] in ('completed', 'failed'): - iotests.log('Gracefully ending the `drive-mirror` job on source...') - iotests.log(source_vm.qmp('block-job-cancel', device='mirror-job0')) - break + iotests.log('Starting migration...') + source_vm.qmp('migrate-set-capabilities', + capabilities=[{'capability': 'events', 'state': True}]) + dest_vm.qmp('migrate-set-capabilities', + capabilities=[{'capability': 'events', 'state': True}]) + iotests.log(source_vm.qmp('migrate', uri='unix:{0}'.format(migration_sock_path))) -while True: - event2 = source_vm.event_wait('BLOCK_JOB_COMPLETED') - iotests.log(event2, filters=[iotests.filter_qmp_event]) - if event2['event'] == 'BLOCK_JOB_COMPLETED': - iotests.log('Stopping the NBD server on destination...') - iotests.log(dest_vm.qmp('nbd-server-stop')) - break + while True: + event1 = source_vm.event_wait('MIGRATION') + iotests.log(event1, filters=[iotests.filter_qmp_event]) + if event1['data']['status'] in ('completed', 'failed'): + iotests.log('Gracefully ending the `drive-mirror` job on source...') + iotests.log(source_vm.qmp('block-job-cancel', device='mirror-job0')) + break + + while True: + event2 = source_vm.event_wait('BLOCK_JOB_COMPLETED') + iotests.log(event2, filters=[iotests.filter_qmp_event]) + if event2['event'] == 'BLOCK_JOB_COMPLETED': + iotests.log('Stopping the NBD server on destination...') + iotests.log(dest_vm.qmp('nbd-server-stop')) + break diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 7233983f3c..07fa1626a0 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -160,6 +160,32 @@ class Timeout: def timeout(self, signum, frame): raise Exception(self.errmsg) + +class FilePath(object): + '''An auto-generated filename that cleans itself up. + + Use this context manager to generate filenames and ensure that the file + gets deleted:: + + with TestFilePath('test.img') as img_path: + qemu_img('create', img_path, '1G') + # migration_sock_path is automatically deleted + ''' + def __init__(self, name): + filename = '{0}-{1}'.format(os.getpid(), name) + self.path = os.path.join(test_dir, filename) + + def __enter__(self): + return self.path + + def __exit__(self, exc_type, exc_val, exc_tb): + try: + os.remove(self.path) + except OSError: + pass + return False + + class VM(qtest.QEMUQtestMachine): '''A QEMU VM''' |