diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-03-23 15:17:15 +0000 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2020-03-27 14:30:08 -0400 |
| commit | d6ef883d9d79f0f2f84df4c5e4d0d6c5eda79237 (patch) | |
| tree | 4469ad7d67e411a3a7b6fa66b3c3452551a81bb6 /hw/ide | |
| parent | 9e58f172700a3fc56fd6c97d033efa8ade51c9ce (diff) | |
| download | qemu-d6ef883d9d79f0f2f84df4c5e4d0d6c5eda79237.zip qemu-d6ef883d9d79f0f2f84df4c5e4d0d6c5eda79237.tar.gz qemu-d6ef883d9d79f0f2f84df4c5e4d0d6c5eda79237.tar.bz2 | |
hw/ide/sii3112: Use qdev gpio rather than qemu_allocate_irqs()
Coverity points out (CID 1421984) that we are leaking the
memory returned by qemu_allocate_irqs(). We can avoid this
leak by switching to using qdev_init_gpio_in(); the base
class finalize will free the irqs that this allocates under
the hood.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Tested-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-id: 20200323151715.29454-1-peter.maydell@linaro.org
[Maintainer edit: replace `DEVICE(dev)` by `ds` --js]
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/sii3112.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 06605d7..d69079c 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -251,8 +251,8 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) { SiI3112PCIState *d = SII3112_PCI(dev); PCIIDEState *s = PCI_IDE(dev); + DeviceState *ds = DEVICE(dev); MemoryRegion *mr; - qemu_irq *irq; int i; pci_config_set_interrupt_pin(dev->config, 1); @@ -280,10 +280,10 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) memory_region_init_alias(mr, OBJECT(d), "sii3112.bar4", &d->mmio, 0, 16); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, mr); - irq = qemu_allocate_irqs(sii3112_set_irq, d, 2); + qdev_init_gpio_in(ds, sii3112_set_irq, 2); for (i = 0; i < 2; i++) { - ide_bus_new(&s->bus[i], sizeof(s->bus[i]), DEVICE(dev), i, 1); - ide_init2(&s->bus[i], irq[i]); + ide_bus_new(&s->bus[i], sizeof(s->bus[i]), ds, i, 1); + ide_init2(&s->bus[i], qdev_get_gpio_in(ds, i)); bmdma_init(&s->bus[i], &s->bmdma[i], s); s->bmdma[i].bus = &s->bus[i]; |