From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Tue, 1 Sep 2020 10:40:41 +0000 (+0200)
Subject: hw/ppc/ppc4xx_pci: Use ARRAY_SIZE() instead of magic value
X-Git-Tag: v5.2.0~199^2~10
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4192920cbc962770d54cd932748f913a7b1fe3c7;p=mirror_qemu.git

hw/ppc/ppc4xx_pci: Use ARRAY_SIZE() instead of magic value

Replace the magic '4' by ARRAY_SIZE(s->irq) which is more explicit.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200901104043.91383-4-f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c
index 3ea47df71f..cd3f192a13 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");