Michael S. Tsirkin befeac45d4 Merge remote-tracking branch 'origin/master' into pci ...

Conflicts:
	hw/virtio-pci.c

2011-06-15 18:27:15 +03:00

..

ahci.c

ahci: Fix non-NCQ accesses for LBA > 16bits

2011-05-19 12:08:28 +02:00

ahci.h

ich/ahci: convert to pci_register_bar_simple()

2011-04-07 13:56:46 +03:00

atapi.c

ide/atapi: fix set but unused

2011-05-03 11:29:21 +02:00

cmd646.c

hw/ide/cmd646.c: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:35 +03:00

core.c

ide/core: Remove explicit setting of BM_STATUS_INT

2011-06-08 10:39:32 +02:00

ich.c

Merge remote-tracking branch 'origin/master' into pci

2011-06-15 18:27:15 +03:00

internal.h

ide: Split qdev "ide-drive" into "ide-hd" and "ide-cd"

2011-05-19 10:26:04 +02:00

isa.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

macio.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

microdrive.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

mmio.c

Remove unused sysemu.h include directives

2011-04-15 18:25:41 +00:00

pci.c

ide: Turn debug messages into assertions

2011-05-18 14:38:45 +02:00

pci.h

ide: Split out BMDMA code from ATA core

2010-12-17 16:11:01 +01:00

piix.c

ide/piix: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:33 +03:00

qdev.c

blockdev: Store -drive option media in DriveInfo

2011-05-19 10:26:21 +02:00

via.c

hw/ide/via.c: convert to PCIDeviceInfo to initialize ids

2011-06-12 10:33:35 +03:00