SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/ipack: Remove legacy qemu_allocate_irqs() use

Browse Source 
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:
Philippe Mathieu-Daudé 2025-01-21 08:34:55 +01:00
parent 29df910401
commit d50280af1b
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/char/ipoctal232.c
View File

@ -184,9 +184,9 @@ static void update_irq(IPOctalState *dev, unsigned block)
unsigned intno = block / 2; unsigned intno = block / 2;
if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) { if ((blk0->isr & blk0->imr) || (blk1->isr & blk1->imr)) {
qemu_irq_raise(idev->irq[intno]); qemu_irq_raise(&idev->irq[intno]);
} else { } else {
qemu_irq_lower(idev->irq[intno]); qemu_irq_lower(&idev->irq[intno]);
} }
} }

5
hw/ipack/ipack.c
View File

@ -55,22 +55,19 @@ static void ipack_device_realize(DeviceState *dev, Error **errp)
} }
bus->free_slot = idev->slot + 1; 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); k->realize(dev, errp);
} }
static void ipack_device_unrealize(DeviceState *dev) static void ipack_device_unrealize(DeviceState *dev)
{ {
IPackDevice *idev = IPACK_DEVICE(dev);
IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev); IPackDeviceClass *k = IPACK_DEVICE_GET_CLASS(dev);
if (k->unrealize) { if (k->unrealize) {
k->unrealize(dev); k->unrealize(dev);
return; return;
} }
qemu_free_irqs(idev->irq, 2);
} }
static const Property ipack_device_props[] = { static const Property ipack_device_props[] = {

6
hw/ipack/tpci200.c
View File

@ -275,11 +275,11 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,
if (ip != NULL) { if (ip != NULL) {
if (val & STATUS_INT(i, 0)) { if (val & STATUS_INT(i, 0)) {
DPRINTF("Clear IP %c INT0# status\n", 'A' + i); 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)) { if (val & STATUS_INT(i, 1)) {
DPRINTF("Clear IP %c INT1# status\n", 'A' + i); 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_set = s->status & STATUS_INT(ip_n, intno);
bool int_edge_sensitive = s->ctrl[ip_n] & CTRL_INT_EDGE(intno); bool int_edge_sensitive = s->ctrl[ip_n] & CTRL_INT_EDGE(intno);
if (int_set && !int_edge_sensitive) { if (int_set && !int_edge_sensitive) {
qemu_irq_lower(ip->irq[intno]); qemu_irq_lower(&ip->irq[intno]);
} }
} }

7
include/hw/ipack/ipack.h
View File

@ -12,6 +12,7 @@
#define QEMU_IPACK_H #define QEMU_IPACK_H
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
#include "hw/irq.h"
#include "qom/object.h" #include "qom/object.h"
@ -19,10 +20,8 @@
OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS) OBJECT_DECLARE_SIMPLE_TYPE(IPackBus, IPACK_BUS)
struct IPackBus { struct IPackBus {
/*< private >*/
BusState parent_obj; BusState parent_obj;
/* All fields are private */
uint8_t n_slots; uint8_t n_slots;
uint8_t free_slot; uint8_t free_slot;
qemu_irq_handler set_irq; qemu_irq_handler set_irq;
@ -58,13 +57,11 @@ struct IPackDeviceClass {
}; };
struct IPackDevice { struct IPackDevice {
/*< private >*/
DeviceState parent_obj; DeviceState parent_obj;
/*< public >*/
int32_t slot; int32_t slot;
/* IRQ objects for the IndustryPack INT0# and INT1# */ /* IRQ objects for the IndustryPack INT0# and INT1# */
qemu_irq *irq; IRQState irq[2];
}; };
extern const VMStateDescription vmstate_ipack_device; extern const VMStateDescription vmstate_ipack_device;