Signed-off-by: Max Reitz <mre...@redhat.com> --- tests/qemu-iotests/iotests.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 8499e1b..b3c00dd 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -28,7 +28,7 @@ import qmp import qtest import struct -__all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io', +__all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io', 'qemu_nbd', 'VM', 'QMPTestCase', 'notrun', 'main', 'verify_image_format', 'verify_platform', 'filter_test_dir', 'filter_win32', 'filter_qemu_io', 'filter_chown', 'log'] @@ -43,6 +43,10 @@ qemu_io_args = [os.environ.get('QEMU_IO_PROG', 'qemu-io')] if os.environ.get('QEMU_IO_OPTIONS'): qemu_io_args += os.environ['QEMU_IO_OPTIONS'].strip().split(' ') +qemu_nbd_args = [os.environ.get('QEMU_NBD_PROG', 'qemu-nbd')] +if os.environ.get('QEMU_NBD_OPTIONS'): + qemu_nbd_args += os.environ['QEMU_NBD_OPTIONS'].strip().split(' ') + qemu_args = [os.environ.get('QEMU_PROG', 'qemu')] if os.environ.get('QEMU_OPTIONS'): qemu_args += os.environ['QEMU_OPTIONS'].strip().split(' ') @@ -91,6 +95,11 @@ def qemu_io(*args): sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args))) return subp.communicate()[0] +def qemu_nbd(*args): + '''Run qemu-nbd in the background''' + subp = subprocess.Popen(qemu_nbd_args + list(args)) + return subp + def compare_images(img1, img2): '''Return True if two image files are identical''' return qemu_img('compare', '-f', imgfmt, -- 2.8.0