Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

Enterprise / Virtualization / QEMU - Peter Maydell [linaro.org] - 28 October 2016 08:29 UTC

fd209e4 Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

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(-)

Upstream: git.qemu.org

  • Share