[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/6] hw/isa/piix{3, 4}: Inline and remove create() functions
From: |
Bernhard Beschow |
Subject: |
[PATCH v2 6/6] hw/isa/piix{3, 4}: Inline and remove create() functions |
Date: |
Sun, 22 May 2022 23:24:31 +0200 |
During the previous changesets the create() functions became trivial
wrappers around more generic functions. Modernize the code.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/pc_piix.c | 6 +++++-
hw/isa/piix3.c | 13 -------------
hw/isa/piix4.c | 13 -------------
hw/mips/malta.c | 5 ++++-
include/hw/southbridge/piix.h | 4 ----
5 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 4d4b83a27d..989e101ed6 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -196,6 +196,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,
@@ -206,7 +209,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/hw/isa/piix4.c b/hw/isa/piix4.c
index 1645f63450..aabbda3e91 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -306,16 +306,3 @@ static void piix4_register_types(void)
}
type_init(piix4_register_types)
-
-DeviceState *piix4_create(PCIBus *pci_bus)
-{
- PCIDevice *pci;
- DeviceState *dev;
- int devfn = PCI_DEVFN(10, 0);
-
- pci = pci_create_simple_multifunction(pci_bus, devfn, true,
- TYPE_PIIX4_PCI_DEVICE);
- dev = DEVICE(pci);
-
- return dev;
-}
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index b0fc84ccbb..7afc4bac9a 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -1238,6 +1238,7 @@ void mips_malta_init(MachineState *machine)
int be;
MaltaState *s;
DeviceState *dev;
+ PCIDevice *piix4;
s = MIPS_MALTA(qdev_new(TYPE_MIPS_MALTA));
sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal);
@@ -1399,7 +1400,9 @@ void mips_malta_init(MachineState *machine)
empty_slot_init("GT64120", 0, 0x20000000);
/* Southbridge */
- dev = piix4_create(pci_bus);
+ piix4 = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true,
+ TYPE_PIIX4_PCI_DEVICE);
+ dev = DEVICE(piix4);
isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
smbus = I2C_BUS(qdev_get_child_bus(dev, "smbus"));
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 2c21359efa..2d55dbdef7 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -74,8 +74,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);
-
-DeviceState *piix4_create(PCIBus *pci_bus);
-
#endif
--
2.36.1
- [PATCH v2 0/6] QOM'ify PIIX southbridge creation, Bernhard Beschow, 2022/05/22
- [PATCH v2 2/6] hw/isa/piix{3, 4}: Move pci_map_irq_fn's near pci_set_irq_fn's, Bernhard Beschow, 2022/05/22
- [PATCH v2 3/6] hw/isa/piix{3, 4}: QOM'ify PCI device creation and wiring, Bernhard Beschow, 2022/05/22
- [PATCH v2 4/6] hw/isa/piix{3, 4}: Factor out ISABus retrieval from create() functions, Bernhard Beschow, 2022/05/22
- [PATCH v2 6/6] hw/isa/piix{3, 4}: Inline and remove create() functions,
Bernhard Beschow <=
- [PATCH v2 5/6] hw/isa/piix4: QOM'ify PIIX4 PM creation, Bernhard Beschow, 2022/05/22
- Re: [PATCH v2 0/6] QOM'ify PIIX southbridge creation, Philippe Mathieu-Daudé, 2022/05/22