summaryrefslogtreecommitdiffstats
path: root/hw/m68k
diff options
context:
space:
mode:
authorPeter Maydell2020-11-20 18:23:14 +0100
committerThomas Huth2020-12-09 08:04:34 +0100
commitb0bed2c916286326b248da05b2ca5f6d152aba44 (patch)
tree856eb074200d9d1bc129a6efefaf5f947b4dd8c7 /hw/m68k
parentgitlab-ci: Move coroutine tests across to gitlab (diff)
downloadqemu-b0bed2c916286326b248da05b2ca5f6d152aba44.tar.gz
qemu-b0bed2c916286326b248da05b2ca5f6d152aba44.tar.xz
qemu-b0bed2c916286326b248da05b2ca5f6d152aba44.zip
hw/m68k/mcf5206: Don't leak IRQs in mcf5206_mbar_realize()
Coverity points out that the realize function for the TYPE_MCF5206_MBAR device leaks the IRQ array it allocates with qemu_allocate_irqs(). Keep a pointer to it in the device state struct to avoid the leak. (Since it needs to stay around for the life of the simulation there is no need to actually free it, and the leak was harmless.) Fixes: Coverity CID 1432412 Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Thomas Huth <huth@tuxfamily.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20201120172314.14725-1-peter.maydell@linaro.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/m68k')
-rw-r--r--hw/m68k/mcf5206.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/m68k/mcf5206.c b/hw/m68k/mcf5206.c
index 51d2e0da1c..92a194dbc4 100644
--- a/hw/m68k/mcf5206.c
+++ b/hw/m68k/mcf5206.c
@@ -164,6 +164,7 @@ typedef struct {
M68kCPU *cpu;
MemoryRegion iomem;
+ qemu_irq *pic;
m5206_timer_state *timer[2];
void *uart[2];
uint8_t scr;
@@ -588,17 +589,16 @@ static const MemoryRegionOps m5206_mbar_ops = {
static void mcf5206_mbar_realize(DeviceState *dev, Error **errp)
{
m5206_mbar_state *s = MCF5206_MBAR(dev);
- qemu_irq *pic;
memory_region_init_io(&s->iomem, NULL, &m5206_mbar_ops, s,
"mbar", 0x00001000);
sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem);
- pic = qemu_allocate_irqs(m5206_mbar_set_irq, s, 14);
- s->timer[0] = m5206_timer_init(pic[9]);
- s->timer[1] = m5206_timer_init(pic[10]);
- s->uart[0] = mcf_uart_init(pic[12], serial_hd(0));
- s->uart[1] = mcf_uart_init(pic[13], serial_hd(1));
+ s->pic = qemu_allocate_irqs(m5206_mbar_set_irq, s, 14);
+ s->timer[0] = m5206_timer_init(s->pic[9]);
+ s->timer[1] = m5206_timer_init(s->pic[10]);
+ s->uart[0] = mcf_uart_init(s->pic[12], serial_hd(0));
+ s->uart[1] = mcf_uart_init(s->pic[13], serial_hd(1));
s->cpu = M68K_CPU(qemu_get_cpu(0));
}