| Message ID | 20200901104043.91383-4-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw: Replace some impossible checks by assertions | expand |
On 9/1/20 3:40 AM, Philippe Mathieu-Daudé wrote: > Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/ppc/ppc4xx_pci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On Tue, Sep 01, 2020 at 12:40:41PM +0200, Philippe Mathieu-Daudé wrote: > Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/ppc4xx_pci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c > index 3ea47df71fe..cd3f192a138 100644 > --- a/hw/ppc/ppc4xx_pci.c > +++ b/hw/ppc/ppc4xx_pci.c > @@ -320,7 +320,8 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp) > > b = pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, > ppc4xx_pci_map_irq, s->irq, get_system_memory(), > - get_system_io(), 0, 4, TYPE_PCI_BUS); > + get_system_io(), 0, ARRAY_SIZE(s->irq), > + TYPE_PCI_BUS); > h->bus = b; > > pci_create_simple(b, 0, "ppc4xx-host-bridge");
On 9/1/20 12:40 PM, Philippe Mathieu-Daudé wrote: > Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. We could also define the 'irq' array with PCI_NUM_PINS instead of 4. > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/ppc/ppc4xx_pci.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c > index 3ea47df71fe..cd3f192a138 100644 > --- a/hw/ppc/ppc4xx_pci.c > +++ b/hw/ppc/ppc4xx_pci.c > @@ -320,7 +320,8 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp) > > b = pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, > ppc4xx_pci_map_irq, s->irq, get_system_memory(), > - get_system_io(), 0, 4, TYPE_PCI_BUS); > + get_system_io(), 0, ARRAY_SIZE(s->irq), > + TYPE_PCI_BUS); > h->bus = b; > > pci_create_simple(b, 0, "ppc4xx-host-bridge"); >
On 9/2/20 8:53 AM, Cédric Le Goater wrote: > On 9/1/20 12:40 PM, Philippe Mathieu-Daudé wrote: >> Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. > > We could also define the 'irq' array with PCI_NUM_PINS instead of 4. Good idea, thanks! > >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > >> --- >> hw/ppc/ppc4xx_pci.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c >> index 3ea47df71fe..cd3f192a138 100644 >> --- a/hw/ppc/ppc4xx_pci.c >> +++ b/hw/ppc/ppc4xx_pci.c >> @@ -320,7 +320,8 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp) >> >> b = pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, >> ppc4xx_pci_map_irq, s->irq, get_system_memory(), >> - get_system_io(), 0, 4, TYPE_PCI_BUS); >> + get_system_io(), 0, ARRAY_SIZE(s->irq), >> + TYPE_PCI_BUS); >> h->bus = b; >> >> pci_create_simple(b, 0, "ppc4xx-host-bridge"); >> >
diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 3ea47df71fe..cd3f192a138 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -320,7 +320,8 @@ static void ppc4xx_pcihost_realize(DeviceState *dev, Error **errp) b = pci_register_root_bus(dev, NULL, ppc4xx_pci_set_irq, ppc4xx_pci_map_irq, s->irq, get_system_memory(), - get_system_io(), 0, 4, TYPE_PCI_BUS); + get_system_io(), 0, ARRAY_SIZE(s->irq), + TYPE_PCI_BUS); h->bus = b; pci_create_simple(b, 0, "ppc4xx-host-bridge");
Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/ppc/ppc4xx_pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)