[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create() |
Date: |
Sat, 11 Jun 2022 12:32:59 +0200 |
From: Bernhard Beschow <shentey@gmail.com>
Modernizes the code.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220603185045.143789-11-shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/pc_piix.c | 3 ++-
hw/isa/piix3.c | 3 +--
include/hw/southbridge/piix.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 7d5546600b..70c337c44b 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -207,9 +207,10 @@ static void pc_init1(MachineState *machine,
pci_memory, ram_memory);
pcms->bus = pci_bus;
- piix3 = piix3_create(pci_bus, &isa_bus);
+ piix3 = piix3_create(pci_bus);
piix3->pic = x86ms->gsi;
piix3_devfn = piix3->dev.devfn;
+ isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
} else {
pci_bus = NULL;
i440fx_state = NULL;
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index 89064eb837..d57a7fe6d6 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -417,7 +417,7 @@ static void piix3_register_types(void)
type_init(piix3_register_types)
-PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
+PIIX3State *piix3_create(PCIBus *pci_bus)
{
PIIX3State *piix3;
PCIDevice *pci_dev;
@@ -426,7 +426,6 @@ PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
piix3 = PIIX3_PCI_DEVICE(pci_dev);
- *isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
return piix3;
}
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 9a2dd93c2d..f805fb8683 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -68,6 +68,6 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
#define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
-PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
+PIIX3State *piix3_create(PCIBus *pci_bus);
#endif
--
2.36.1
- [PULL 23/49] hw/acpi/piix4: use qdev gpio to wire up smi_irq, (continued)
- [PULL 23/49] hw/acpi/piix4: use qdev gpio to wire up smi_irq, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 25/49] hw/isa/piix4.c: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 26/49] hw/acpi/piix4: remove unused piix4_pm_initfn() function, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 27/49] hw/southbridge/piix: Aggregate all PIIX southbridge type names, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 28/49] hw/isa/piix4: Use object_initialize_child() for embedded struct, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 29/49] hw/isa/piix4: Move pci_map_irq_fn' near pci_set_irq_fn, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 30/49] hw/isa/piix4: QOM'ify PCI device creation and wiring, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 31/49] hw/isa/piix4: Factor out ISABus retrieval from piix4_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 32/49] hw/isa/piix4: QOM'ify PIIX4 PM creation, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 34/49] hw/isa/piix3: Move pci_map_irq_fn near pci_set_irq_fn, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(),
Philippe Mathieu-Daudé <=
- [PULL 33/49] hw/isa/piix4: Inline and remove piix4_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 37/49] hw/isa/piix3: Inline and remove piix3_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 35/49] hw/isa/piix3: QOM'ify PCI device creation and wiring, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 38/49] hw/i386/microvm-dt: Force explicit failure if retrieving QOM property fails, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 39/49] hw/i386/microvm-dt: Determine mc146818rtc's IRQ number from QOM property, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 40/49] hw/rtc/mc146818rtc: QOM'ify io_base offset, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 44/49] hw/i386/pc: Unexport functions used only internally, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 41/49] hw: Reuse TYPE_I8042 define, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 42/49] hw/audio/cs4231a: Const'ify global tables, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro, Philippe Mathieu-Daudé, 2022/06/11