[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH 05/10] hw/sh4/r2d.c: convert r2d_fpga to QOM
From: |
Shannon Zhao |
Subject: |
[Qemu-trivial] [PATCH 05/10] hw/sh4/r2d.c: convert r2d_fpga to QOM |
Date: |
Thu, 2 Jul 2015 17:49:18 +0800 |
From: Shannon Zhao <address@hidden>
Convert r2d_fpga to QOM and this fixes the memory leak caused by
qemu_allocate_irqs.
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/sh4/r2d.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++++------------
1 file changed, 64 insertions(+), 16 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 5e22ed7..b1bfad9 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -57,7 +57,13 @@
#define PA_VERREG 0x32
#define PA_OUTPORT 0x36
+#define TYPE_R2D_FPGA "r2d_fpga"
+#define R2D_FPGA(obj) \
+ OBJECT_CHECK(r2d_fpga_t, (obj), TYPE_R2D_FPGA)
+
typedef struct {
+ SysBusDevice parent;
+
uint16_t bcr;
uint16_t irlmsk;
uint16_t irlmon;
@@ -177,18 +183,61 @@ static const MemoryRegionOps r2d_fpga_ops = {
.endianness = DEVICE_NATIVE_ENDIAN,
};
-static qemu_irq *r2d_fpga_init(MemoryRegion *sysmem,
- hwaddr base, qemu_irq irl)
+static void r2d_fpga_initfn(Object *obj)
{
- r2d_fpga_t *s;
+ DeviceState *dev = DEVICE(obj);
+ r2d_fpga_t *s = R2D_FPGA(obj);
+ SysBusDevice *sysbus = SYS_BUS_DEVICE(obj);
- s = g_malloc0(sizeof(r2d_fpga_t));
+ qdev_init_gpio_in(dev, r2d_fpga_irq_set, NR_IRQS);
+ sysbus_init_irq(sysbus, &s->irl);
+ sysbus_init_mmio(sysbus, &s->iomem);
+}
- s->irl = irl;
+static void r2d_fpga_realize(DeviceState *dev, Error **errp)
+{
+ r2d_fpga_t *s = R2D_FPGA(dev);
memory_region_init_io(&s->iomem, NULL, &r2d_fpga_ops, s, "r2d-fpga", 0x40);
- memory_region_add_subregion(sysmem, base, &s->iomem);
- return qemu_allocate_irqs(r2d_fpga_irq_set, s, NR_IRQS);
+}
+
+static void r2d_fpga_class_init(ObjectClass *klass, void *class_data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = r2d_fpga_realize;
+}
+
+static const TypeInfo r2d_fpga_info = {
+ .name = TYPE_R2D_FPGA,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(r2d_fpga_t),
+ .instance_init = r2d_fpga_initfn,
+ .class_init = r2d_fpga_class_init,
+};
+
+static void r2d_fpga_register_types(void)
+{
+ type_register_static(&r2d_fpga_info);
+}
+
+type_init(r2d_fpga_register_types);
+
+static DeviceState *r2d_fpga_init(MemoryRegion *sysmem,
+ hwaddr base, qemu_irq irl)
+{
+ DeviceState *dev;
+ SysBusDevice *sysbus;
+
+ dev = qdev_create(NULL, TYPE_R2D_FPGA);
+ qdev_init_nofail(dev);
+
+ sysbus = SYS_BUS_DEVICE(dev);
+ sysbus_connect_irq(sysbus, 0, irl);
+ memory_region_add_subregion(sysmem, base,
+ sysbus_mmio_get_region(sysbus, 0));
+
+ return dev;
}
typedef struct ResetData {
@@ -230,10 +279,9 @@ static void r2d_init(MachineState *machine)
ResetData *reset_info;
struct SH7750State *s;
MemoryRegion *sdram = g_new(MemoryRegion, 1);
- qemu_irq *irq;
DriveInfo *dinfo;
int i;
- DeviceState *dev;
+ DeviceState *dev, *r2d_fpga;
SysBusDevice *busdev;
MemoryRegion *address_space_mem = get_system_memory();
PCIBus *pci_bus;
@@ -260,7 +308,7 @@ static void r2d_init(MachineState *machine)
memory_region_add_subregion(address_space_mem, SDRAM_BASE, sdram);
/* Register peripherals */
s = sh7750_init(cpu, address_space_mem);
- irq = r2d_fpga_init(address_space_mem, 0x04000000, sh7750_irl(s));
+ r2d_fpga = r2d_fpga_init(address_space_mem, 0x04000000, sh7750_irl(s));
dev = qdev_create(NULL, "sh_pci");
busdev = SYS_BUS_DEVICE(dev);
@@ -268,19 +316,19 @@ static void r2d_init(MachineState *machine)
pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci"));
sysbus_mmio_map(busdev, 0, P4ADDR(0x1e200000));
sysbus_mmio_map(busdev, 1, A7ADDR(0x1e200000));
- sysbus_connect_irq(busdev, 0, irq[PCI_INTA]);
- sysbus_connect_irq(busdev, 1, irq[PCI_INTB]);
- sysbus_connect_irq(busdev, 2, irq[PCI_INTC]);
- sysbus_connect_irq(busdev, 3, irq[PCI_INTD]);
+ sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(r2d_fpga, PCI_INTA));
+ sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(r2d_fpga, PCI_INTB));
+ sysbus_connect_irq(busdev, 2, qdev_get_gpio_in(r2d_fpga, PCI_INTC));
+ sysbus_connect_irq(busdev, 3, qdev_get_gpio_in(r2d_fpga, PCI_INTD));
sm501_init(address_space_mem, 0x10000000, SM501_VRAM_SIZE,
- irq[SM501], serial_hds[2]);
+ qdev_get_gpio_in(r2d_fpga, SM501), serial_hds[2]);
/* onboard CF (True IDE mode, Master only). */
dinfo = drive_get(IF_IDE, 0, 0);
dev = qdev_create(NULL, "mmio-ide");
busdev = SYS_BUS_DEVICE(dev);
- sysbus_connect_irq(busdev, 0, irq[CF_IDE]);
+ sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(r2d_fpga, CF_IDE));
qdev_prop_set_uint32(dev, "shift", 1);
qdev_init_nofail(dev);
sysbus_mmio_map(busdev, 0, 0x14001000);
--
2.0.4
- [Qemu-trivial] [PATCH 00/10] fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 06/10] hw/arm/palm.c: Fix misusing qemu_allocate_irqs, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 07/10] hw/arm/spitz.c: Fix misusing qemu_allocate_irqs, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 09/10] hw/mips/mips_int.c: use qemu_allocate_irq to fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 08/10] hw/arm/tosa.c: Fix misusing qemu_allocate_irqs, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 10/10] hw/openrisc/pic_cpu.c: use qemu_allocate_irq to fix memory leak, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 01/10] hw/ppc/ppc4xx_devs.c: Convert ppcuic to QOM, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 04/10] hw/m68k/mcf_intc.c: convert mcf_intc to QOM, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 05/10] hw/sh4/r2d.c: convert r2d_fpga to QOM,
Shannon Zhao <=
- [Qemu-trivial] [PATCH 03/10] hw/m68k/mcf5206.c: convert m5206_mbar to QOM, Shannon Zhao, 2015/07/02
- [Qemu-trivial] [PATCH 02/10] include/hw/sparc/grlib.h: Store irqs in DeviceState, Shannon Zhao, 2015/07/02