mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Mark Cave-Ayland 2022-05-28 10:02:11 +01:00 committed by Philippe Mathieu-Daudé
parent 19eb2a0da2
commit d0af99ac12
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/acpi/piix4.c
View File

@ -497,9 +497,9 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
piix4_pm_add_properties(s); 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, qemu_irq sci_irq, qemu_irq smi_irq,
bool smm_enabled) bool smm_enabled)
{ {
PCIDevice *pci_dev; PCIDevice *pci_dev;
DeviceState *dev; DeviceState *dev;

6
hw/i386/pc_piix.c
View File

@ -283,9 +283,9 @@ static void pc_init1(MachineState *machine,
PIIX4PMState *piix4_pm; PIIX4PMState *piix4_pm;
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); 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, x86ms->gsi[9], smi_irq,
x86_machine_is_smm_enabled(x86ms)); x86_machine_is_smm_enabled(x86ms));
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c")); pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"));
/* TODO: Populate SPD eeprom data. */ /* TODO: Populate SPD eeprom data. */
smbus_eeprom_init(pcms->smbus, 8, NULL, 0); smbus_eeprom_init(pcms->smbus, 8, NULL, 0);

6
hw/isa/piix4.c
View File

@ -311,9 +311,9 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci"); pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");
if (smbus) { 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), qdev_get_gpio_in_named(dev, "isa", 9),
NULL, 0); NULL, 0);
*smbus = I2C_BUS(qdev_get_child_bus(DEVICE(pms), "i2c")); *smbus = I2C_BUS(qdev_get_child_bus(DEVICE(pms), "i2c"));
} }

6
include/hw/southbridge/piix.h
View File

@ -16,9 +16,9 @@
#include "qom/object.h" #include "qom/object.h"
#include "hw/acpi/piix4.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, qemu_irq sci_irq, qemu_irq smi_irq,
bool smm_enabled); bool smm_enabled);
/* PIRQRC[A:D]: PIRQx Route Control Registers */ /* PIRQRC[A:D]: PIRQx Route Control Registers */
#define PIIX_PIRQCA 0x60 #define PIIX_PIRQCA 0x60