diff options
| author | Avi Kivity <avi@redhat.com> | 2011-04-04 18:28:02 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-04-07 13:56:46 +0300 |
| commit | 667bb59d2358daeef179583c944becba3f1f9680 (patch) | |
| tree | c8af44ed0610964b2f588bb56e2c817a76d11b6c /hw | |
| parent | f32dd06ba6299e6c9174e94bd0ac9e4f7828bd78 (diff) | |
| download | qemu-667bb59d2358daeef179583c944becba3f1f9680.tar.gz | |
ich/ahci: convert to pci_register_bar_simple()
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/ide/ahci.c | 9 | ||||
| -rw-r--r-- | hw/ide/ahci.h | 3 | ||||
| -rw-r--r-- | hw/ide/ich.c | 3 |
3 files changed, 1 insertions, 14 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 98bdf7059a..c6e0c7767e 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1129,15 +1129,6 @@ void ahci_uninit(AHCIState *s) qemu_free(s->dev); } -void ahci_pci_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type) -{ - struct AHCIPCIState *d = (struct AHCIPCIState *)pci_dev; - AHCIState *s = &d->ahci; - - cpu_register_physical_memory(addr, size, s->mem); -} - void ahci_reset(void *opaque) { struct AHCIPCIState *d = opaque; diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index a4560c41b6..dc86951ebf 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -325,9 +325,6 @@ typedef struct NCQFrame { void ahci_init(AHCIState *s, DeviceState *qdev, int ports); void ahci_uninit(AHCIState *s); -void ahci_pci_map(PCIDevice *pci_dev, int region_num, - pcibus_t addr, pcibus_t size, int type); - void ahci_reset(void *opaque); #endif /* HW_IDE_AHCI_H */ diff --git a/hw/ide/ich.c b/hw/ide/ich.c index f242d7a81f..eb00f03b33 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -95,8 +95,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev) qemu_register_reset(ahci_reset, d); /* XXX BAR size should be 1k, but that breaks, so bump it to 4k for now */ - pci_register_bar(&d->card, 5, 0x1000, PCI_BASE_ADDRESS_SPACE_MEMORY, - ahci_pci_map); + pci_register_bar_simple(&d->card, 5, 0x1000, 0, d->ahci.mem); msi_init(dev, 0x50, 1, true, false); |