[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 51/86] sun4u: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 51/86] sun4u: convert to memory API |
Date: |
Wed, 20 Jul 2011 19:50:01 +0300 |
fixes memory leak on repeated BAR map/unmap
Signed-off-by: Avi Kivity <address@hidden>
---
hw/sun4u.c | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/hw/sun4u.c b/hw/sun4u.c
index d7dcaf0..74a06a8 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -91,6 +91,12 @@ struct hwdef {
uint64_t console_serial_base;
};
+typedef struct EbusState {
+ PCIDevice pci_dev;
+ MemoryRegion bar0;
+ MemoryRegion bar1;
+} EbusState;
+
int DMA_get_channel_mode (int nchan)
{
return 0;
@@ -518,21 +524,6 @@ void cpu_tick_set_limit(CPUTimer *timer, uint64_t limit)
}
}
-static void ebus_mmio_mapfunc(PCIDevice *pci_dev, int region_num,
- pcibus_t addr, pcibus_t size, int type)
-{
- EBUS_DPRINTF("Mapping region %d registers at %" FMT_PCIBUS "\n",
- region_num, addr);
- switch (region_num) {
- case 0:
- isa_mmio_init(addr, 0x1000000);
- break;
- case 1:
- isa_mmio_init(addr, 0x800000);
- break;
- }
-}
-
static void dummy_isa_irq_handler(void *opaque, int n, int level)
{
}
@@ -549,27 +540,31 @@ pci_ebus_init(PCIBus *bus, int devfn)
}
static int
-pci_ebus_init1(PCIDevice *s)
+pci_ebus_init1(PCIDevice *pci_dev)
{
- isa_bus_new(&s->qdev);
+ EbusState *s = container_of(pci_dev, EbusState, pci_dev);
+
+ isa_bus_new(&pci_dev->qdev);
- s->config[0x04] = 0x06; // command = bus master, pci mem
- s->config[0x05] = 0x00;
- s->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no error
- s->config[0x07] = 0x03; // status = medium devsel
- s->config[0x09] = 0x00; // programming i/f
- s->config[0x0D] = 0x0a; // latency_timer
+ pci_dev->config[0x04] = 0x06; // command = bus master, pci mem
+ pci_dev->config[0x05] = 0x00;
+ pci_dev->config[0x06] = 0xa0; // status = fast back-to-back, 66MHz, no
error
+ pci_dev->config[0x07] = 0x03; // status = medium devsel
+ pci_dev->config[0x09] = 0x00; // programming i/f
+ pci_dev->config[0x0D] = 0x0a; // latency_timer
- pci_register_bar(s, 0, 0x1000000, PCI_BASE_ADDRESS_SPACE_MEMORY,
- ebus_mmio_mapfunc);
- pci_register_bar(s, 1, 0x800000, PCI_BASE_ADDRESS_SPACE_MEMORY,
- ebus_mmio_mapfunc);
+ isa_mmio_setup(&s->bar0, 0x1000000);
+ pci_register_bar_region(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY,
+ &s->bar0);
+ isa_mmio_setup(&s->bar1, 0x800000);
+ pci_register_bar_region(pci_dev, 1, PCI_BASE_ADDRESS_SPACE_MEMORY,
+ &s->bar1);
return 0;
}
static PCIDeviceInfo ebus_info = {
.qdev.name = "ebus",
- .qdev.size = sizeof(PCIDevice),
+ .qdev.size = sizeof(EbusState),
.init = pci_ebus_init1,
.vendor_id = PCI_VENDOR_ID_SUN,
.device_id = PCI_DEVICE_ID_SUN_EBUS,
--
1.7.5.3
- [Qemu-devel] [RFC v5 85/86] vga: drop get_system_memory() from vga devices and derivatives, (continued)
- [Qemu-devel] [RFC v5 85/86] vga: drop get_system_memory() from vga devices and derivatives, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 27/86] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 71/86] omap_gpmc/nseries/tusb6010: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 40/86] ide: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 08/86] memory: late initialization of ram_addr, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 80/86] versatile_pci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 50/86] isa-mmio: concert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 39/86] es1370: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 46/86] ppc: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 44/86] intel-hda: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 51/86] sun4u: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [RFC v5 75/86] ppc4xx_sdram: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 81/86] ppce500_pci: convert to sysbus_init_mmio_cb2(), Avi Kivity, 2011/07/20
- Re: [Qemu-devel] [RFC v5 00/86] Memory API, Jan Kiszka, 2011/07/20