[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 13/16] iotests.py: Add qemu_nbd function
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 13/16] iotests.py: Add qemu_nbd function |
Date: |
Tue, 1 Mar 2016 00:19:30 +0100 |
Signed-off-by: Max Reitz <address@hidden>
---
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 0a238ec..dd8805a 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']
# This will not work if arguments contain spaces but is necessary if we
@@ -41,6 +41,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(' ')
@@ -86,6 +90,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.7.1
- [Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), (continued)
- [Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 07/16] block/nbd: Use qdict_put(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 11/16] block/nbd: Use SocketAddress options, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 13/16] iotests.py: Add qemu_nbd function,
Max Reitz <=
- Re: [Qemu-block] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Eric Blake, 2016/02/29