Re: [PATCH v2 05/22] hw/ppc/pnv: Determine ns16550's IRQ number from QOM property

[Philippe Mathieu-Daudé]

On 22/2/22 20:34, Bernhard Beschow wrote:
> Determine the IRQ number in the same way as for isa-ipmi-bt. This resolves
> the last usage of ISADevice::isairq[] which allows it to be removed.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/ppc/pnv.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index 837146a2fb..1e9f6b0690 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -380,9 +380,12 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int 
> lpc_off)
>           cpu_to_be32(io_base),
>           cpu_to_be32(8)
>       };
> +    uint32_t irq;
>       char *name;
>       int node;
>   
> +    irq = object_property_get_int(OBJECT(d), "irq", &error_fatal);

object_property_get_[u]int(), otherwise:

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>       name = g_strdup_printf("%s@i%x", qdev_fw_name(DEVICE(d)), io_base);
>       node = fdt_add_subnode(fdt, lpc_off, name);
>       _FDT(node);
> @@ -394,7 +397,7 @@ static void pnv_dt_serial(ISADevice *d, void *fdt, int 
> lpc_off)
>   
>       _FDT((fdt_setprop_cell(fdt, node, "clock-frequency", 1843200)));
>       _FDT((fdt_setprop_cell(fdt, node, "current-speed", 115200)));
> -    _FDT((fdt_setprop_cell(fdt, node, "interrupts", d->isairq[0])));
> +    _FDT((fdt_setprop_cell(fdt, node, "interrupts", irq)));
>       _FDT((fdt_setprop_cell(fdt, node, "interrupt-parent",
>                              fdt_get_phandle(fdt, lpc_off))));
>