[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/5] via-ide: use qdev gpio rather than qemu_allocate_irqs()
From: |
John Snow |
Subject: |
[PULL 4/5] via-ide: use qdev gpio rather than qemu_allocate_irqs() |
Date: |
Fri, 27 Mar 2020 16:15:00 -0400 |
From: Mark Cave-Ayland <address@hidden>
This prevents the memory from qemu_allocate_irqs() from being leaked which
can in some cases be spotted by Coverity (CID 1421984).
Signed-off-by: Mark Cave-Ayland <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>
---
hw/ide/via.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/ide/via.c b/hw/ide/via.c
index 2a55b7fbc6..be09912b33 100644
--- a/hw/ide/via.c
+++ b/hw/ide/via.c
@@ -160,6 +160,7 @@ static void via_ide_reset(DeviceState *dev)
static void via_ide_realize(PCIDevice *dev, Error **errp)
{
PCIIDEState *d = PCI_IDE(dev);
+ DeviceState *ds = DEVICE(dev);
uint8_t *pci_conf = dev->config;
int i;
@@ -187,9 +188,10 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
bmdma_setup_bar(d);
pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+ qdev_init_gpio_in(ds, via_ide_set_irq, 2);
for (i = 0; i < 2; i++) {
- ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2);
- ide_init2(&d->bus[i], qemu_allocate_irq(via_ide_set_irq, d, i));
+ ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2);
+ ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i));
bmdma_init(&d->bus[i], &d->bmdma[i], d);
d->bmdma[i].bus = &d->bus[i];
--
2.21.1
- [PULL 0/5] Ide patches, John Snow, 2020/03/27
- [PULL 1/5] fdc/i8257: implement verify transfer mode, John Snow, 2020/03/27
- [PULL 2/5] hw/ide/sii3112: Use qdev gpio rather than qemu_allocate_irqs(), John Snow, 2020/03/27
- [PULL 3/5] via-ide: don't use PCI level for legacy IRQs, John Snow, 2020/03/27
- [PULL 4/5] via-ide: use qdev gpio rather than qemu_allocate_irqs(),
John Snow <=
- [PULL 5/5] cmd646-ide: use qdev gpio rather than qemu_allocate_irqs(), John Snow, 2020/03/27
- Re: [PULL 0/5] Ide patches, Peter Maydell, 2020/03/28