[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 05/11] hw/isa/piix4: Factor out ISABus retrieval from piix4_cr
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 05/11] hw/isa/piix4: Factor out ISABus retrieval from piix4_create() |
Date: |
Fri, 3 Jun 2022 20:50:39 +0200 |
Modernizes the code.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/isa/piix4.c | 6 +-----
hw/mips/malta.c | 3 ++-
include/hw/southbridge/piix.h | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 058bebb5e2..96df21a610 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -312,7 +312,7 @@ static void piix4_register_types(void)
type_init(piix4_register_types)
-DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
+DeviceState *piix4_create(PCIBus *pci_bus, I2CBus **smbus)
{
PCIDevice *pci;
DeviceState *dev;
@@ -322,10 +322,6 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus
**isa_bus, I2CBus **smbus)
TYPE_PIIX4_PCI_DEVICE);
dev = DEVICE(pci);
- if (isa_bus) {
- *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
- }
-
if (smbus) {
pci = pci_new(devfn + 3, TYPE_PIIX4_PM);
qdev_prop_set_uint32(DEVICE(pci), "smb_io_base", 0x1100);
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 9ffdc5b8f1..e446b25ad0 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1399,7 +1399,8 @@ void mips_malta_init(MachineState *machine)
empty_slot_init("GT64120", 0, 0x20000000);
/* Southbridge */
- dev = piix4_create(pci_bus, &isa_bus, &smbus);
+ dev = piix4_create(pci_bus, &smbus);
+ isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
/* Interrupt controller */
qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq);
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 3b97186f75..dab5c9704e 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -70,6 +70,6 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
-DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus);
+DeviceState *piix4_create(PCIBus *pci_bus, I2CBus **smbus);
#endif
--
2.36.1
- [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Bernhard Beschow, 2022/06/03
- [PATCH v4 02/11] hw/isa/piix4: Use object_initialize_child() for embedded struct, Bernhard Beschow, 2022/06/03
- [PATCH v4 01/11] hw/southbridge/piix: Aggregate all PIIX southbridge type names, Bernhard Beschow, 2022/06/03
- [PATCH v4 04/11] hw/isa/piix4: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/06/03
- [PATCH v4 05/11] hw/isa/piix4: Factor out ISABus retrieval from piix4_create(),
Bernhard Beschow <=
- [PATCH v4 03/11] hw/isa/piix4: Move pci_map_irq_fn' near pci_set_irq_fn, Bernhard Beschow, 2022/06/03
- [PATCH v4 06/11] hw/isa/piix4: QOM'ify PIIX4 PM creation, Bernhard Beschow, 2022/06/03
- [PATCH v4 08/11] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn, Bernhard Beschow, 2022/06/03
- [PATCH v4 09/11] hw/isa/piix3: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/06/03
- [PATCH v4 07/11] hw/isa/piix4: Inline and remove piix4_create(), Bernhard Beschow, 2022/06/03
- [PATCH v4 10/11] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(), Bernhard Beschow, 2022/06/03
- [PATCH v4 11/11] hw/isa/piix3: Inline and remove piix3_create(), Bernhard Beschow, 2022/06/03
- Re: [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Mark Cave-Ayland, 2022/06/06
- Re: [PATCH v4 00/11] QOM'ify PIIX southbridge creation, Philippe Mathieu-Daudé, 2022/06/11