hw/char/pci-multi: Convert legacy qemu_allocate_irqs to qemu_init_irq
PATCH 1/1 hw/char/pci-multi: Convert legacy qemu_allocate_irqs to qemu_init_irq
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.
---
Based-on: <[email protected]>
"hw/irq: Introduce qemu_init_irqs() helper"
--- hw/char/serial-pci-multi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/char/serial-pci-multi.c +3 -4
@@ -45,7 +45,7 @@ typedef struct PCIMultiSerialState {char *name[PCI_SERIAL_MAX_PORTS ];SerialState state[PCI_SERIAL_MAX_PORTS ];uint32_t level[PCI_SERIAL_MAX_PORTS ]; -qemu_irq *irqs; +IRQState irqs[PCI_SERIAL_MAX_PORTS ];uint8_t prog_if; } PCIMultiSerialState;
@@ -61,7 +61,6 @@ static void multi_serial_pci_exit(PCIDevice *dev)memory_region_del_subregion (&pci->iobar, &s->io);g_free (pci->name[i]); } -qemu_free_irqs (pci->irqs, pci->ports); }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 ;memory_region_init (&pci->iobar,OBJECT (pci),"multiserial" ,8 * nports);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++) { s = pci->state + i;
@@ -110,7 +108,7 @@ static void multi_serial_pci_realize(PCIDevice *dev, Error **errp)multi_serial_pci_exit (dev);return ; } - s->irq = pci->irqs[i]; + s->irq = &pci->irqs[i]; pci->name[i] =g_strdup_printf ("uart #%zu" , i +1 );memory_region_init_io (&s->io,OBJECT (pci), &serial_io_ops, s, 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));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 ); } }
Signature · 1 line
2.47.1
Quoted 5 lines · Philippe Mathieu-Daudé
There are a fixed number of PCI IRQs, known beforehand. Allocate them within PCIMultiSerialState, and initialize using
qemu_init_irq(), allowing to remove the legacyqemu_allocate_irqs()andqemu_free_irqs()calls.
Quoted 7 lines
Signed-off-by Philippe Mathieu-Daudé<[email protected]>---
Based-on:<[email protected]>
"hw/irq: Introduceqemu_init_irqs()helper"--- hw/char/serial-pci-multi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
r~
Quoted 5 lines · Philippe Mathieu-Daudé
There are a fixed number of PCI IRQs, known beforehand. Allocate them within PCIMultiSerialState, and initialize using
qemu_init_irq(), allowing to remove the legacyqemu_allocate_irqs()andqemu_free_irqs()calls.
Quoted 7 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Based-on: <[email protected]>
"hw/irq: Introduceqemu_init_irqs()helper"--- hw/char/serial-pci-multi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Patch queued.