diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-03 21:35:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-03 21:35:01 +0100 |
| commit | df8176274a19c3b4502a10b2bffba914f690f1ab (patch) | |
| tree | f1ac1c93dc46ea3574f04c2de57ad718e18da4c8 /tests | |
| parent | 67a7bfe560a1bba59efab085cb3430f45176d382 (diff) | |
| parent | eb705985f43d631438a318f1146eac61ae10d273 (diff) | |
| download | qemu-df8176274a19c3b4502a10b2bffba914f690f1ab.zip qemu-df8176274a19c3b4502a10b2bffba914f690f1ab.tar.gz qemu-df8176274a19c3b4502a10b2bffba914f690f1ab.tar.bz2 | |
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-09-02' into staging
nbd patches for 2020-09-02
- fix a few iotests affected by earlier nbd changes
- avoid blocking qemu by nbd client in connect()
- build qemu-nbd for mingw
# gpg: Signature made Wed 02 Sep 2020 22:52:31 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-09-02:
nbd: disable signals and forking on Windows builds
nbd: skip SIGTERM handler if NBD device support is not built
block: add missing socket_init() calls to tools
block/nbd: use non-blocking connect: fix vm hang on connect()
iotests/259: Fix reference output
iotests/059: Fix reference output
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/059.out | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/259.out | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out index 6d127e2..2b83c0c 100644 --- a/tests/qemu-iotests/059.out +++ b/tests/qemu-iotests/059.out @@ -19,8 +19,8 @@ file format: IMGFMT virtual size: 2 GiB (2147483648 bytes) === Testing monolithicFlat with zeroed_grain === -qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 +qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain === Testing big twoGbMaxExtentFlat === Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 diff --git a/tests/qemu-iotests/259.out b/tests/qemu-iotests/259.out index e27b9ff..1aaadfd 100644 --- a/tests/qemu-iotests/259.out +++ b/tests/qemu-iotests/259.out @@ -10,5 +10,5 @@ disk size: unavailable --- Testing creation for which the node would need to grow --- Formatting 'TEST_DIR/t.IMGFMT', fmt=qcow2 size=67108864 preallocation=metadata -qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Image format driver does not support resize +qemu-img: TEST_DIR/t.IMGFMT: Could not resize image: Cannot grow NBD nodes *** done |