diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-05-05 15:47:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-05-05 15:47:44 +0100 |
| commit | f19d118bed77bb95681b07f4e76dbb700c16918d (patch) | |
| tree | 7de95fff444132b901f574bd0894608f4e027877 /tests | |
| parent | a2261b2754c94df036b3585dcc82c669b78d0902 (diff) | |
| parent | 714eb0dbc5480c8a9d9f39eb931cb5d2acc1b6c6 (diff) | |
| download | qemu-f19d118bed77bb95681b07f4e76dbb700c16918d.zip qemu-f19d118bed77bb95681b07f4e76dbb700c16918d.tar.gz qemu-f19d118bed77bb95681b07f4e76dbb700c16918d.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-05-04' into staging
nbd patches for 2020-05-04
- reduce client-side fragmentation of NBD trim and status requests
- fix iotest 41 when run in deep tree
- fix socket activation in qemu-nbd
# gpg: Signature made Mon 04 May 2020 22:12:21 BST
# gpg: using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# 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-2020-05-04:
block/nbd-client: drop max_block restriction from discard
block/nbd-client: drop max_block restriction from block_status
iotests/041: Fix NBD socket path
tools: Fix use of fcntl(F_SETFD) during socket activation
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/041 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 5d67bf1..46bf1f6 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -35,7 +35,7 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img') quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img') quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img') -nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock') +nbd_sock_path = os.path.join(iotests.sock_dir, 'nbd.sock') class TestSingleDrive(iotests.QMPTestCase): image_len = 1 * 1024 * 1024 # MB |