| Message ID | 20220528091934.15520-2-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/acpi/piix4: remove legacy piix4_pm_init() function | expand |
On Sat, May 28, 2022 at 2:49 PM Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> wrote: > > This logic can be included as part of piix4_pm_realize() and does not need to > be handled externally. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Ani Sinha <ani@anisinha.ca> > --- > hw/acpi/piix4.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index fe5625d07a..bf20fa139b 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -525,6 +525,10 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) > s->machine_ready.notify = piix4_pm_machine_ready; > qemu_add_machine_init_done_notifier(&s->machine_ready); > > + if (xen_enabled()) { > + s->use_acpi_hotplug_bridge = false; > + } > + > piix4_acpi_system_hot_add_init(pci_address_space_io(dev), > pci_get_bus(dev), s); > qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s)); > @@ -551,9 +555,6 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, > s->irq = sci_irq; > s->smi_irq = smi_irq; > s->smm_enabled = smm_enabled; > - if (xen_enabled()) { > - s->use_acpi_hotplug_bridge = false; > - } > > pci_realize_and_unref(pci_dev, bus, &error_fatal); > > -- > 2.20.1 >
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index fe5625d07a..bf20fa139b 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -525,6 +525,10 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp) s->machine_ready.notify = piix4_pm_machine_ready; qemu_add_machine_init_done_notifier(&s->machine_ready); + if (xen_enabled()) { + s->use_acpi_hotplug_bridge = false; + } + piix4_acpi_system_hot_add_init(pci_address_space_io(dev), pci_get_bus(dev), s); qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(s)); @@ -551,9 +555,6 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s->irq = sci_irq; s->smi_irq = smi_irq; s->smm_enabled = smm_enabled; - if (xen_enabled()) { - s->use_acpi_hotplug_bridge = false; - } pci_realize_and_unref(pci_dev, bus, &error_fatal);
This logic can be included as part of piix4_pm_realize() and does not need to be handled externally. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/acpi/piix4.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)