[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/10] ich/ahci: convert to pci_register_bar_simple(
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 05/10] ich/ahci: convert to pci_register_bar_simple() |
Date: |
Mon, 4 Apr 2011 18:28:02 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/ide/ahci.c | 9 ---------
hw/ide/ahci.h | 3 ---
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 98bdf70..c6e0c77 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 a4560c4..dc86951 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 f242d7a..eb00f03 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);
--
1.7.1
- [Qemu-devel] [PATCH 00/10] pci: pci_register_bar_simple, Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 03/10] cirrus-vga: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 05/10] ich/ahci: convert to pci_register_bar_simple(),
Avi Kivity <=
- [Qemu-devel] [PATCH 01/10] pci: add pci_register_bar_simple() API, Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 08/10] pcnet-pci: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 02/10] rtl8139: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 09/10] usb-ohci: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 04/10] eepro100: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 06/10] hda-intel: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 07/10] hda-intel: convert to pci_register_bar_simple() (partial), Avi Kivity, 2011/04/04
- [Qemu-devel] [PATCH 10/10] wdt_i6300esb: convert to pci_register_bar_simple(), Avi Kivity, 2011/04/04
- [Qemu-devel] Re: [PATCH 00/10] pci: pci_register_bar_simple, Michael S. Tsirkin, 2011/04/04