[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v2 4/7] hw/sh4/r2d.c: Store irq array in MachineSt
From: |
Shannon Zhao |
Subject: |
[Qemu-trivial] [PATCH v2 4/7] hw/sh4/r2d.c: Store irq array in MachineState to fix memory leak |
Date: |
Sat, 30 May 2015 15:54:34 +0800 |
From: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
Signed-off-by: Shannon Zhao <address@hidden>
---
hw/sh4/r2d.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 4221060..39edefd 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -230,7 +230,6 @@ 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;
@@ -260,7 +259,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));
+ machine->irqs = r2d_fpga_init(address_space_mem, 0x04000000,
sh7750_irl(s));
dev = qdev_create(NULL, "sh_pci");
busdev = SYS_BUS_DEVICE(dev);
@@ -268,19 +267,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, machine->irqs[PCI_INTA]);
+ sysbus_connect_irq(busdev, 1, machine->irqs[PCI_INTB]);
+ sysbus_connect_irq(busdev, 2, machine->irqs[PCI_INTC]);
+ sysbus_connect_irq(busdev, 3, machine->irqs[PCI_INTD]);
sm501_init(address_space_mem, 0x10000000, SM501_VRAM_SIZE,
- irq[SM501], serial_hds[2]);
+ machine->irqs[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, machine->irqs[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 v2 0/7] Add a member in MachineState to store irq array, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 2/7] hw/mips/mips_jazz.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 1/7] hw/ppc/ppc440_bamboo.c: Add a member in MachineState to store irq array, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 7/7] hw/arm/tosa.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 4/7] hw/sh4/r2d.c: Store irq array in MachineState to fix memory leak,
Shannon Zhao <=
- [Qemu-trivial] [PATCH v2 5/7] hw/arm/palm.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 6/7] hw/arm/spitz.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30
- [Qemu-trivial] [PATCH v2 3/7] hw/m68k/an5206.c: Store irq array in MachineState to fix memory leak, Shannon Zhao, 2015/05/30