hw/acpi/piix4: rename piix4_pm_init() to piix4_pm_initfn()
When QOMifying a device it is typical to use _init() as the suffix for an instance_init function, however this name is already in use by the legacy piix4_pm_init() wrapper function. Eventually the wrapper function will be removed, but for now rename it to piix4_pm_initfn() to avoid a naming collision. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20220528091934.15520-7-mark.cave-ayland@ilande.co.uk> Reviewed-by: Bernhard Beschow <shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
parent
19eb2a0da2
commit
d0af99ac12
@ -497,7 +497,7 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
|
||||
piix4_pm_add_properties(s);
|
||||
}
|
||||
|
||||
PIIX4PMState *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
|
||||
PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base,
|
||||
qemu_irq sci_irq, qemu_irq smi_irq,
|
||||
bool smm_enabled)
|
||||
{
|
||||
|
@ -283,7 +283,7 @@ static void pc_init1(MachineState *machine,
|
||||
PIIX4PMState *piix4_pm;
|
||||
|
||||
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
|
||||
piix4_pm = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
|
||||
piix4_pm = piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100,
|
||||
x86ms->gsi[9], smi_irq,
|
||||
x86_machine_is_smm_enabled(x86ms));
|
||||
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"));
|
||||
|
@ -311,7 +311,7 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
|
||||
|
||||
pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");
|
||||
if (smbus) {
|
||||
pms = piix4_pm_init(pci_bus, devfn + 3, 0x1100,
|
||||
pms = piix4_pm_initfn(pci_bus, devfn + 3, 0x1100,
|
||||
qdev_get_gpio_in_named(dev, "isa", 9),
|
||||
NULL, 0);
|
||||
*smbus = I2C_BUS(qdev_get_child_bus(DEVICE(pms), "i2c"));
|
||||
|
@ -16,7 +16,7 @@
|
||||
#include "qom/object.h"
|
||||
#include "hw/acpi/piix4.h"
|
||||
|
||||
PIIX4PMState *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
|
||||
PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base,
|
||||
qemu_irq sci_irq, qemu_irq smi_irq,
|
||||
bool smm_enabled);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user