diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-08 15:54:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-08 15:54:36 -0500 |
| commit | cad2b59c198340a636c5e015fb90e0326a1d3dd7 (patch) | |
| tree | 1441c300722db4bda79e32a1e61e9e1c7f997a43 /tests/qemu-iotests/042 | |
| parent | 5f5a1318653c08e435cfa52f60b6a712815b659d (diff) | |
| parent | 794d00f71d39e3d18eafade579b2ecb665d6d481 (diff) | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (7) and Fam Zheng (3)
# Via Kevin Wolf
* kwolf/for-anthony:
qemu-iotests: fix 017 018 for vmdk
qemu-iotests: exclude vmdk and qcow from 043
qemu-iotests: exclude vmdk for test 042
qtest/ide-test: Test short and long PRDTs
qtest/ide-test: Add simple DMA read/write test case
qtest: Add IDE test case
libqos/pci: Enable bus mastering
ide: Reset BMIDEA bit when the bus master is stopped
de_DE.po: Add missing leading spaces
ahci: Don't allow creating slave drives
Message-id: 1368023344-29731-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'tests/qemu-iotests/042')
| -rwxr-xr-x | tests/qemu-iotests/042 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042 index c3c3ca8d02..16b2fdbd5e 100755 --- a/tests/qemu-iotests/042 +++ b/tests/qemu-iotests/042 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt qcow2 qcow qed vmdk +_supported_fmt qcow2 qcow qed _supported_proto file _supported_os Linux |