qemu/hw/ide
Michael S. Tsirkin 5e59b02435 Merge branch pci into master
Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
	hw/esp.c
2012-07-29 17:05:35 +03:00
..
ahci.c ide/ahci: Use universal DMA helper functions 2012-06-27 16:33:25 -05:00
ahci.h ide/ahci: Use universal DMA helper functions 2012-06-27 16:33:25 -05:00
atapi.c atapi: implement READ DISC INFORMATION 2012-07-02 10:18:41 +02:00
cmd646.c Merge branch pci into master 2012-07-29 17:05:35 +03:00
core.c hw/block-common: Factor out fall back to legacy -drive cyls=... 2012-07-17 16:48:32 +02:00
ich.c Merge branch pci into master 2012-07-29 17:05:35 +03:00
internal.h hw/block-common: Move BlockConf & friends from block.h 2012-07-17 16:48:32 +02:00
isa.c qom: Unify type registration 2012-02-15 09:39:21 -06:00
macio.c iommu: Make sglists and dma_bdrv helpers use new universal DMA helpers 2012-06-27 16:33:25 -05:00
Makefile.objs build: convert libhw to nested Makefile.objs 2012-06-07 09:21:17 +02:00
microdrive.c hw: Trim superfluous #include "block_int.h" 2011-09-12 15:17:21 +02:00
mmio.c ide/mmio: convert to memory API 2011-11-24 18:31:59 +02:00
pci.c ide: fix compilation errors when DEBUG_IDE is set 2012-02-10 10:44:52 +00:00
pci.h
piix.c Merge branch pci into master 2012-07-29 17:05:35 +03:00
qdev.c hw/block-common: Factor out fall back to legacy -drive cyls=... 2012-07-17 16:48:32 +02:00
via.c Merge branch pci into master 2012-07-29 17:05:35 +03:00