ich/ahci: convert to pci_register_bar_simple()

Signed-off-by: Avi Kivity <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 98bdf7059a6e3ce791f791c9661ca03f74d888c1..c6e0c7767e717dc668796160f26ff7c544903730 100644 (file)
--- 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 a4560c41b60ae92157700c1ab5d45012611940a9..dc86951ebfd52e6709c9e8c589ccc56dec3ead64 100644 (file)
--- 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 f242d7a81fe34892491db729a4d926d77391ac78..eb00f03b33f2a0945159080f81f82fdaa09cfdb4 100644 (file)
--- 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);