diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-14 18:44:22 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-14 18:44:22 +0000 |
| commit | 4191d0eb414b14bcf3eab803095566aeb9b198f0 (patch) | |
| tree | b1f06b29951d355bfd0c1682abb8c1d43f3ec6ea /tests/qemu-iotests/group | |
| parent | 03d51428e2da0188a0adea00cbd713cc1e967e7a (diff) | |
| parent | 46dea4160d587add2f3670306c41ad9ad4064af5 (diff) | |
| download | qemu-4191d0eb414b14bcf3eab803095566aeb9b198f0.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Block pull request
# gpg: Signature made Fri 14 Mar 2014 16:12:14 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
qemu-iotests: remove 085 and 087 from 'quick' group
qemu-iotests: add 083 NBD client disconnect tests
tests: add nbd-fault-injector.py utility
nbd: close socket if connection breaks
block: Explicitly specify 'unsigned long long' for VHDX 64-bit constants
blockdev: Refuse to open encrypted image unless paused
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/group')
| -rw-r--r-- | tests/qemu-iotests/group | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index e96eafdf43..ee09ebc98e 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -85,6 +85,7 @@ 079 rw auto 081 rw auto 082 rw auto quick -085 rw auto quick +083 rw auto +085 rw auto 086 rw auto quick -087 rw auto quick +087 rw auto |