From: Anthony Liguori Date: Wed, 8 May 2013 20:54:36 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Tag: v1.5.0-rc1~1 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=cad2b59c198340a636c5e015fb90e0326a1d3dd7 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 --- cad2b59c198340a636c5e015fb90e0326a1d3dd7