mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-09 02:24:58 -06:00
hw/ipack: Remove legacy qemu_allocate_irqs() use
No need to dynamically allocate IRQ when we know before hands how many we'll use. Declare the 2 of them in IPackDevice state and initialize them in the DeviceRealize handler. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20250121155526.29982-4-philmd@linaro.org>
This commit is contained in:
parent
29df910401
commit
d50280af1b
4 changed files with 8 additions and 14 deletions
|
@ -55,22 +55,19 @@ static void ipack_device_realize(DeviceState *dev, Error **errp)
|
|||
}
|
||||
bus->free_slot = idev->slot + 1;
|
||||
|
||||
idev->irq = qemu_allocate_irqs(bus->set_irq, idev, 2);
|
||||
qemu_init_irqs(idev->irq, ARRAY_SIZE(idev->irq), bus->set_irq, idev);
|
||||
|
||||
k->realize(dev, errp);
|
||||
}
|
||||
|
||||
static void ipack_device_unrealize(DeviceState *dev)
|
||||
{
|
||||
IPackDevice *idev = IPACK_DEVICE(dev);
|
||||
IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev);
|
||||
|
||||
if (k->unrealize) {
|
||||
k->unrealize(dev);
|
||||
return;
|
||||
}
|
||||
|
||||
qemu_free_irqs(idev->irq, 2);
|
||||
}
|
||||
|
||||
static const Property ipack_device_props[] = {
|
||||
|
|
|
@ -275,11 +275,11 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,
|
|||
if (ip != NULL) {
|
||||
if (val & STATUS_INT(i, 0)) {
|
||||
DPRINTF("Clear IP %c INT0# status\n", 'A' + i);
|
||||
qemu_irq_lower(ip->irq[0]);
|
||||
qemu_irq_lower(&ip->irq[0]);
|
||||
}
|
||||
if (val & STATUS_INT(i, 1)) {
|
||||
DPRINTF("Clear IP %c INT1# status\n", 'A' + i);
|
||||
qemu_irq_lower(ip->irq[1]);
|
||||
qemu_irq_lower(&ip->irq[1]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -344,7 +344,7 @@ static uint64_t tpci200_read_las1(void *opaque, hwaddr addr, unsigned size)
|
|||
bool int_set = s->status & STATUS_INT(ip_n, intno);
|
||||
bool int_edge_sensitive = s->ctrl[ip_n] & CTRL_INT_EDGE(intno);
|
||||
if (int_set && !int_edge_sensitive) {
|
||||
qemu_irq_lower(ip->irq[intno]);
|
||||
qemu_irq_lower(&ip->irq[intno]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue