[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/11] hw/isa/piix3: Inline and remove piix3_create()
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 11/11] hw/isa/piix3: Inline and remove piix3_create() |
Date: |
Fri, 3 Jun 2022 20:50:45 +0200 |
During the previous changesets piix3_create() became a trivial
wrapper around more generic functions. Modernize the code.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/pc_piix.c | 6 +++++-
hw/isa/piix3.c | 13 -------------
include/hw/southbridge/piix.h | 2 --
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c884d1a489..b58fbd4815 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -197,6 +197,9 @@ static void pc_init1(MachineState *machine,
if (pcmc->pci_enabled) {
PIIX3State *piix3;
+ PCIDevice *pci_dev;
+ const char *type = xen_enabled() ? TYPE_PIIX3_XEN_DEVICE
+ : TYPE_PIIX3_DEVICE;
pci_bus = i440fx_init(host_type,
pci_type,
@@ -207,7 +210,8 @@ static void pc_init1(MachineState *machine,
pci_memory, ram_memory);
pcms->bus = pci_bus;
- piix3 = piix3_create(pci_bus);
+ pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
+ piix3 = PIIX3_PCI_DEVICE(pci_dev);
piix3->pic = x86ms->gsi;
piix3_devfn = piix3->dev.devfn;
isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index c6ff7795f4..01c376b39a 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -399,16 +399,3 @@ static void piix3_register_types(void)
}
type_init(piix3_register_types)
-
-PIIX3State *piix3_create(PCIBus *pci_bus)
-{
- PIIX3State *piix3;
- PCIDevice *pci_dev;
- const char *type = xen_enabled() ? TYPE_PIIX3_XEN_DEVICE
- : TYPE_PIIX3_DEVICE;
-
- pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
- piix3 = PIIX3_PCI_DEVICE(pci_dev);
-
- return piix3;
-}
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index f805fb8683..2693778b23 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -68,6 +68,4 @@ 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);
-
#endif
--
2.36.1
- [PATCH v4 02/11] hw/isa/piix4: Use object_initialize_child() for embedded struct, (continued)
- [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, 2022/06/03
- [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 <=
- 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