diff options
| author | Andreas Färber <afaerber@suse.de> | 2014-06-18 00:55:18 -0700 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-06-30 21:13:30 +0200 |
| commit | f3c7d0389fe8a2792fd4c1cf151b885de03c8f62 (patch) | |
| tree | 17a37a957d51c956c3c9e98b8e4cdd6ac1adf3dd /hw/sd | |
| parent | 127a4e1a51c038ec9167083b65d376dddcc64530 (diff) | |
| download | qemu-f3c7d0389fe8a2792fd4c1cf151b885de03c8f62.zip qemu-f3c7d0389fe8a2792fd4c1cf151b885de03c8f62.tar.gz qemu-f3c7d0389fe8a2792fd4c1cf151b885de03c8f62.tar.bz2 | |
hw: Fix qemu_allocate_irqs() leaks
Replace qemu_allocate_irqs(foo, bar, 1)[0]
with qemu_allocate_irq(foo, bar, 0).
This avoids leaking the dereferenced qemu_irq *.
Cc: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
[PC Changes:
* Applied change to instance in sh4/sh7750.c
]
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Kirill Batuzov <batuzovk@ispras.ru>
[AF: Fix IRQ index in sh4/sh7750.c]
Cc: qemu-stable@nongnu.org
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/sd')
| -rw-r--r-- | hw/sd/omap_mmc.c | 2 | ||||
| -rw-r--r-- | hw/sd/sdhci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 937a478..6c92149 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -625,7 +625,7 @@ struct omap_mmc_s *omap2_mmc_init(struct omap_target_agent_s *ta, exit(1); } - s->cdet = qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0]; + s->cdet = qemu_allocate_irq(omap_mmc_cover_cb, s, 0); sd_set_cb(s->card, NULL, s->cdet); return s; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 3e13d70..b5a9eee 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1168,8 +1168,8 @@ static void sdhci_initfn(Object *obj) if (s->card == NULL) { exit(1); } - s->eject_cb = qemu_allocate_irqs(sdhci_insert_eject_cb, s, 1)[0]; - s->ro_cb = qemu_allocate_irqs(sdhci_card_readonly_cb, s, 1)[0]; + s->eject_cb = qemu_allocate_irq(sdhci_insert_eject_cb, s, 0); + s->ro_cb = qemu_allocate_irq(sdhci_card_readonly_cb, s, 0); sd_set_cb(s->card, s->ro_cb, s->eject_cb); s->insert_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_raise_insertion_irq, s); |