[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/16] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 06/16] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq() |
Date: |
Mon, 7 Mar 2022 11:11:57 +0100 |
From: Bernhard Beschow <shentey@gmail.com>
Passing PIIX4State rather than just the qemu_irq allows for resolving
the global piix4_dev variable.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20220217101924.15347-5-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/piix4.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 179968b18e..caa2002e2c 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -57,7 +57,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PIIX4State, PIIX4_PCI_DEVICE)
static void piix4_set_irq(void *opaque, int irq_num, int level)
{
int i, pic_irq, pic_level;
- qemu_irq *pic = opaque;
+ PIIX4State *s = opaque;
PCIBus *bus = pci_get_bus(piix4_dev);
/* now we change the pic irq level according to the piix irq mappings */
@@ -71,7 +71,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int
level)
pic_level |= pci_bus_get_irq_level(bus, i);
}
}
- qemu_set_irq(pic[pic_irq], pic_level);
+ qemu_set_irq(s->isa[pic_irq], pic_level);
}
}
@@ -319,7 +319,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus
**isa_bus, I2CBus **smbus)
NULL, 0, NULL);
}
- pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s->isa, 4);
+ pci_bus_irqs(pci_bus, piix4_set_irq, pci_slot_get_pirq, s, 4);
return dev;
}
--
2.34.1
- [PULL 00/16] MIPS patches for 2022-03-07, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 01/16] target/mips: Fix cycle counter timing calculations, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 02/16] target/mips: Remove duplicated MIPSCPU::cp0_count_rate, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 03/16] hw/mips/gt64xxx_pci: Fix PCI IRQ levels to be preserved during migration, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 04/16] malta: Move PCI interrupt handling from gt64xxx_pci to piix4, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 05/16] hw/isa/piix4: Resolve redundant i8259[] attribute, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 06/16] hw/isa/piix4: Pass PIIX4State as opaque parameter for piix4_set_irq(),
Philippe Mathieu-Daudé <=
- [PULL 07/16] hw/isa/piix4: Resolve global instance variable, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 08/16] hw/isa/piix4: Replace some magic IRQ constants, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 09/16] hw/mips/gt64xxx_pci: Resolve gt64120_register(), Philippe Mathieu-Daudé, 2022/03/07
- [PULL 10/16] hw/rtc/mc146818rtc: QOM'ify IRQ number, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 11/16] hw/rtc/m48t59-isa: QOM'ify IRQ number, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 12/16] hw/input/pckbd: QOM'ify IRQ numbers, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 13/16] hw/isa/isa-bus: Remove isabus_dev_print(), Philippe Mathieu-Daudé, 2022/03/07
- [PULL 14/16] isa: Drop unused attributes from ISADevice, Philippe Mathieu-Daudé, 2022/03/07
- [PULL 15/16] isa: Inline and remove one-line isa_init_irq(), Philippe Mathieu-Daudé, 2022/03/07