diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 18:17:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-13 18:17:32 +0100 |
| commit | d1bf88e56f46c75d472dc60c02bbbc7b474519f9 (patch) | |
| tree | f773f3c6540d6e9ad94ee83b0a8b45843f77fe42 /tests/qemu-iotests/147 | |
| parent | 650a379d505bf558bcb41124bc6c951a76cbc113 (diff) | |
| parent | 611ae1d71647c58b23dc2c116a946884ce30abf8 (diff) | |
| download | qemu-d1bf88e56f46c75d472dc60c02bbbc7b474519f9.zip qemu-d1bf88e56f46c75d472dc60c02bbbc7b474519f9.tar.gz qemu-d1bf88e56f46c75d472dc60c02bbbc7b474519f9.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-06-13' into staging
nbd patches for 2019-06-13
- add 'qemu-nbd --pid-file'
- NBD-related iotest improvements
- NBD code refactoring in preparation for reconnect
# gpg: Signature made Thu 13 Jun 2019 16:37:58 BST
# gpg: using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg: aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A
* remotes/ericb/tags/pull-nbd-2019-06-13:
block/nbd: merge NBDClientSession struct back to BDRVNBDState
block/nbd: merge nbd-client.* to nbd.c
block/nbd-client: drop stale logout
nbd/server: Nicer spelling of max BLOCK_STATUS reply length
iotests: Let 233 run concurrently
iotests: Use qemu-nbd's --pid-file
qemu-nbd: Do not close stderr
iotests.py: Add qemu_nbd_early_pipe()
qemu-nbd: Add --pid-file option
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/147')
| -rwxr-xr-x | tests/qemu-iotests/147 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/147 b/tests/qemu-iotests/147 index 8251327..2d84fdd 100755 --- a/tests/qemu-iotests/147 +++ b/tests/qemu-iotests/147 @@ -24,7 +24,7 @@ import socket import stat import time import iotests -from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_pipe +from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_pipe NBD_PORT_START = 32768 NBD_PORT_END = NBD_PORT_START + 1024 @@ -93,7 +93,7 @@ class QemuNBD(NBDBlockdevAddBase): pass def _try_server_up(self, *args): - status, msg = qemu_nbd_pipe('-f', imgfmt, test_img, *args) + status, msg = qemu_nbd_early_pipe('-f', imgfmt, test_img, *args) if status == 0: return True if 'Address already in use' in msg: |