[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/5] hw: Replace magic value by PCI_NUM_PINS definition
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 1/5] hw: Replace magic value by PCI_NUM_PINS definition |
Date: |
Mon, 12 Oct 2020 15:20:12 +0200 |
Use self-explicit PCI_NUM_PINS definition instead of magic value.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/virt.c | 4 ++--
hw/mips/gt64xxx_pci.c | 2 +-
hw/pci-host/versatile.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index e465a988d68..ddad9621f79 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1117,11 +1117,11 @@ static void create_pcie_irq_map(const VirtMachineState
*vms,
int first_irq, const char *nodename)
{
int devfn, pin;
- uint32_t full_irq_map[4 * 4 * 10] = { 0 };
+ uint32_t full_irq_map[4 * PCI_NUM_PINS * 10] = { 0 };
uint32_t *irq_map = full_irq_map;
for (devfn = 0; devfn <= 0x18; devfn += 0x8) {
- for (pin = 0; pin < 4; pin++) {
+ for (pin = 0; pin < PCI_NUM_PINS; pin++) {
int irq_type = GIC_FDT_IRQ_TYPE_SPI;
int irq_nr = first_irq + ((pin + PCI_SLOT(devfn)) % PCI_NUM_PINS);
int irq_level = GIC_FDT_IRQ_FLAGS_LEVEL_HI;
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index e091bc4ed55..ff1a35755f6 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -1018,7 +1018,7 @@ static void gt64120_pci_set_irq(void *opaque, int
irq_num, int level)
if (pic_irq < 16) {
/* The pic level is the logical OR of all the PCI irqs mapped to it. */
pic_level = 0;
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < PCI_NUM_PINS; i++) {
if (pic_irq == piix4_dev->config[PIIX_PIRQCA + i]) {
pic_level |= pci_irq_levels[i];
}
diff --git a/hw/pci-host/versatile.c b/hw/pci-host/versatile.c
index 3553277f941..b4951023f4e 100644
--- a/hw/pci-host/versatile.c
+++ b/hw/pci-host/versatile.c
@@ -75,7 +75,7 @@ enum {
struct PCIVPBState {
PCIHostState parent_obj;
- qemu_irq irq[4];
+ qemu_irq irq[PCI_NUM_PINS];
MemoryRegion controlregs;
MemoryRegion mem_config;
MemoryRegion mem_config2;
@@ -412,7 +412,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
object_initialize(&s->pci_dev, sizeof(s->pci_dev),
TYPE_VERSATILE_PCI_HOST);
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < PCI_NUM_PINS; i++) {
sysbus_init_irq(sbd, &s->irq[i]);
}
@@ -422,7 +422,7 @@ static void pci_vpb_realize(DeviceState *dev, Error **errp)
mapfn = pci_vpb_map_irq;
}
- pci_bus_irqs(&s->pci_bus, pci_vpb_set_irq, mapfn, s->irq, 4);
+ pci_bus_irqs(&s->pci_bus, pci_vpb_set_irq, mapfn, s->irq, PCI_NUM_PINS);
/* Our memory regions are:
* 0 : our control registers
--
2.26.2
- [PATCH v2 0/5] hw: Replace some magic by definitions, Philippe Mathieu-Daudé, 2020/10/12
- [PATCH v2 1/5] hw: Replace magic value by PCI_NUM_PINS definition,
Philippe Mathieu-Daudé <=
- [PATCH v2 2/5] hw/pci-host/pam: Use ARRAY_SIZE() instead of magic value, Philippe Mathieu-Daudé, 2020/10/12
- [PATCH v2 3/5] hw/pci-host/versatile: Add the MEMORY_WINDOW_COUNT definition, Philippe Mathieu-Daudé, 2020/10/12
- [PATCH v2 4/5] hw/pci-host/versatile: Add the PCI_BAR_COUNT definition, Philippe Mathieu-Daudé, 2020/10/12
- [PATCH v2 5/5] tests/qtest: Replace magic value by NANOSECONDS_PER_SECOND definition, Philippe Mathieu-Daudé, 2020/10/12
- Re: [PATCH v2 0/5] hw: Replace some magic by definitions, Richard Henderson, 2020/10/13