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

hw/char/pci-multi: Convert legacy qemu_allocate_irqs to qemu_init_irq

Browse Source 
There are a fixed number of PCI IRQs, known beforehand.
Allocate them within PCIMultiSerialState, and initialize
using qemu_init_irq(), allowing to remove the legacy
qemu_allocate_irqs() and qemu_free_irqs() calls.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250121182828.45088-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-21 08:07:21 +01:00
parent 6b8f40c61b
commit 4ef6d66547
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/char/serial-pci-multi.c
View File

@ -45,7 +45,7 @@ typedef struct PCIMultiSerialState {
char *name[PCI_SERIAL_MAX_PORTS]; char *name[PCI_SERIAL_MAX_PORTS];
SerialState state[PCI_SERIAL_MAX_PORTS]; SerialState state[PCI_SERIAL_MAX_PORTS];
uint32_t level[PCI_SERIAL_MAX_PORTS]; uint32_t level[PCI_SERIAL_MAX_PORTS];
qemu_irq *irqs; IRQState irqs[PCI_SERIAL_MAX_PORTS];
uint8_t prog_if; uint8_t prog_if;
} PCIMultiSerialState; } PCIMultiSerialState;
@ -61,7 +61,6 @@ static void multi_serial_pci_exit(PCIDevice *dev)
memory_region_del_subregion(&pci->iobar, &s->io); memory_region_del_subregion(&pci->iobar, &s->io);
g_free(pci->name[i]); g_free(pci->name[i]);
} }
qemu_free_irqs(pci->irqs, pci->ports);
} }
static void multi_serial_irq_mux(void *opaque, int n, int level) static void multi_serial_irq_mux(void *opaque, int n, int level)
@ -102,7 +101,6 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)
pci->dev.config[PCI_INTERRUPT_PIN] = 0x01; pci->dev.config[PCI_INTERRUPT_PIN] = 0x01;
memory_region_init(&pci->iobar, OBJECT(pci), "multiserial", 8 * nports); memory_region_init(&pci->iobar, OBJECT(pci), "multiserial", 8 * nports);
pci_register_bar(&pci->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->iobar); pci_register_bar(&pci->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &pci->iobar);
pci->irqs = qemu_allocate_irqs(multi_serial_irq_mux, pci, nports);
for (i = 0; i < nports; i++) { for (i = 0; i < nports; i++) {
s = pci->state + i; s = pci->state + i;
@ -110,7 +108,7 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)
multi_serial_pci_exit(dev); multi_serial_pci_exit(dev);
return; return;
} }
s->irq = pci->irqs[i]; s->irq = &pci->irqs[i];
pci->name[i] = g_strdup_printf("uart #%zu", i + 1); pci->name[i] = g_strdup_printf("uart #%zu", i + 1);
memory_region_init_io(&s->io, OBJECT(pci), &serial_io_ops, s, memory_region_init_io(&s->io, OBJECT(pci), &serial_io_ops, s,
pci->name[i], 8); pci->name[i], 8);
@ -183,6 +181,7 @@ static void multi_serial_init(Object *o)
size_t i, nports = multi_serial_get_port_count(PCI_DEVICE_GET_CLASS(dev)); size_t i, nports = multi_serial_get_port_count(PCI_DEVICE_GET_CLASS(dev));
for (i = 0; i < nports; i++) { for (i = 0; i < nports; i++) {
qemu_init_irq(&pms->irqs[i], multi_serial_irq_mux, pms, i);
object_initialize_child(o, "serial[*]", &pms->state[i], TYPE_SERIAL); object_initialize_child(o, "serial[*]", &pms->state[i], TYPE_SERIAL);
} }
} }