diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 17:13:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 17:13:57 +0000 |
| commit | 8ba4bca570ace1e60614a0808631a517cf5df67a (patch) | |
| tree | de890352542f697bffbdb12bbe7ff638f47f0bf5 /tests | |
| parent | 35f15acbc15d5abaa76ea2df6c068c28a2b456c2 (diff) | |
| parent | b248e61652e20c3353af4b0ccb90f17d76f4db21 (diff) | |
| download | qemu-8ba4bca570ace1e60614a0808631a517cf5df67a.zip qemu-8ba4bca570ace1e60614a0808631a517cf5df67a.tar.gz qemu-8ba4bca570ace1e60614a0808631a517cf5df67a.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- qemu-storage-daemon: Enable object-add
- blockjob: Fix crash with IOthread when block commit after snapshot
- monitor: Shutdown fixes
- xen-block: fix reporting of discard feature
- qcow2: Remove half-initialised image file after failed image creation
- ahci: Fix DMA direction
- iotests fixes
# gpg: Signature made Mon 15 Feb 2021 14:58:47 GMT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
monitor/qmp: Stop processing requests when shutdown is requested
monitor: Fix assertion failure on shutdown
block: qcow2: remove the created file on initialization error
block: add bdrv_co_delete_file_noerr
crypto: luks: Fix tiny memory leak
tests/qemu-iotests: Remove test 259 from the "auto" group
xen-block: fix reporting of discard feature
hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE
blockjob: Fix crash with IOthread when block commit after snapshot
iotests: Consistent $IMGOPTS boundary matching
qemu-storage-daemon: Enable object-add
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/259 | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.rc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/259 b/tests/qemu-iotests/259 index 76cde42..1b15e8f 100755 --- a/tests/qemu-iotests/259 +++ b/tests/qemu-iotests/259 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# group: rw auto quick +# group: rw quick # # Test generic image creation fallback (by using NBD) # diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 77c37e8..65cdba5 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -885,7 +885,9 @@ _unsupported_imgopts() { for bad_opt do - if echo "$IMGOPTS" | grep -q 2>/dev/null "$bad_opt" + # Add a space so tests can match for whitespace that marks the + # end of an option (\b or \> are not portable) + if echo "$IMGOPTS " | grep -q 2>/dev/null "$bad_opt" then _notrun "not suitable for image option: $bad_opt" fi |