From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
Kevin Wolf <kwolf@redhat.com>, Eric Blake <eblake@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH v5 09/13] iotests.py: Add qemu_nbd function
Date: Tue, 25 Oct 2016 15:11:37 +0200 [thread overview]
Message-ID: <20161025131141.24762-10-mreitz@redhat.com> (raw)
In-Reply-To: <20161025131141.24762-1-mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/iotests.py | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 3329bc1..5a2678f 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -39,6 +39,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_prog = os.environ.get('QEMU_PROG', 'qemu')
qemu_opts = os.environ.get('QEMU_OPTIONS', '').strip().split(' ')
@@ -87,6 +91,10 @@ 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 daemon mode and return the parent's exit code'''
+ return subprocess.call(qemu_nbd_args + ['--fork'] + list(args))
+
def compare_images(img1, img2, fmt1=imgfmt, fmt2=imgfmt):
'''Return True if two image files are identical'''
return qemu_img('compare', '-f', fmt1,
--
2.10.1
next prev parent reply other threads:[~2016-10-25 13:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 13:11 [Qemu-devel] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 01/13] block/nbd: Drop trailing "." in error messages Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 02/13] block/nbd: Reject port parameter without host Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 03/13] block/nbd: Default port in nbd_refresh_filename() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 04/13] block/nbd: Use qdict_put() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 05/13] block/nbd: Add nbd_has_filename_options_conflict() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 06/13] block/nbd: Accept SocketAddress Max Reitz
2016-10-25 15:30 ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 07/13] block/nbd: Use SocketAddress options Max Reitz
2016-10-26 9:51 ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-25 23:57 ` Eric Blake
2016-10-26 8:09 ` Kevin Wolf
2016-10-26 14:17 ` Max Reitz
2016-10-26 9:54 ` Kevin Wolf
2016-10-25 13:11 ` Max Reitz [this message]
2016-10-26 10:04 ` [Qemu-devel] [PATCH v5 09/13] iotests.py: Add qemu_nbd function Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 10/13] iotests.py: Allow concurrent qemu instances Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 11/13] socket_scm_helper: Accept fd directly Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 12/13] iotests: Add assert_json_filename_equal() method Max Reitz
2016-10-26 10:41 ` Kevin Wolf
2016-10-26 14:24 ` Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 13/13] iotests: Add test for NBD's blockdev-add interface Max Reitz
2016-10-25 14:41 ` Markus Armbruster
2016-10-26 14:25 ` Max Reitz
2016-10-26 13:08 ` Kevin Wolf
2016-10-25 13:16 ` [Qemu-devel] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-27 17:08 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161025131141.24762-10-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).