OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize()

Browse Source 
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: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <20220528091934.15520-2-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 0c285e0128
commit 3f0efcac43
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/acpi/piix4.c
View File

@ -525,6 +525,10 @@ static void piix4_pm_realize(PCIDevice *dev, Error **errp)
s->machine_ready.notify = piix4_pm_machine_ready; s->machine_ready.notify = piix4_pm_machine_ready;
qemu_add_machine_init_done_notifier(&s->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), piix4_acpi_system_hot_add_init(pci_address_space_io(dev),
pci_get_bus(dev), s); pci_get_bus(dev), s);
qbus_set_hotplug_handler(BUS(pci_get_bus(dev)), OBJECT(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->irq = sci_irq;
s->smi_irq = smi_irq; s->smi_irq = smi_irq;
s->smm_enabled = smm_enabled; s->smm_enabled = smm_enabled;
if (xen_enabled()) {
s->use_acpi_hotplug_bridge = false;
}
pci_realize_and_unref(pci_dev, bus, &error_fatal); pci_realize_and_unref(pci_dev, bus, &error_fatal);