The following changes since commit 835f3d24b42fcbeca5c49048994a4e5d0fe905c5:
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20161027-1' into staging (2016-10-27 17:24:29 +0100) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to c9bf278bf20f99827da65156915f78e0ce53c68e: qemu-iotests: Test creating floppy drives (2016-10-27 16:29:14 -0400) ---------------------------------------------------------------- ---------------------------------------------------------------- Kevin Wolf (4): fdc: Add a floppy qbus fdc: Add a floppy drive qdev fdc: Move qdev properties to FloppyDrive qemu-iotests: Test creating floppy drives Mark Cave-Ayland (2): dma-helpers: explicitly pass alignment into DMA helpers macio: switch over to new byte-aligned DMA helpers dma-helpers.c | 21 +- hw/block/fdc.c | 271 ++++++++-- hw/block/nvme.c | 6 +- hw/ide/ahci.c | 2 + hw/ide/core.c | 6 +- hw/ide/macio.c | 213 ++------ hw/scsi/scsi-disk.c | 2 + include/sysemu/dma.h | 6 +- tests/qemu-iotests/172 | 246 ++++++++++ tests/qemu-iotests/172.out | 1170 ++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + vl.c | 1 + 12 files changed, 1695 insertions(+), 250 deletions(-) create mode 100755 tests/qemu-iotests/172 create mode 100644 tests/qemu-iotests/172.out -- 2.7.4
