[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 01/11] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_i
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 01/11] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize() |
Date: |
Mon, 30 May 2022 13:27:08 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
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>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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.36.1
- [PATCH v2 00/11] hw/acpi/piix4: remove legacy piix4_pm_init() function, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 01/11] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize(),
Philippe Mathieu-Daudé <=
- [PATCH v2 03/11] hw/acpi/piix4: convert smm_enabled bool to qdev property, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 02/11] hw/acpi/piix4: change smm_enabled from int to bool, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 04/11] hw/acpi/piix4: move PIIX4PMState into separate piix4.h header, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 05/11] hw/acpi/piix4: alter piix4_pm_init() to return PIIX4PMState, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 06/11] hw/acpi/piix4: rename piix4_pm_init() to piix4_pm_initfn(), Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 07/11] hw/acpi/piix4: use qdev gpio to wire up sci_irq, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 08/11] hw/acpi/piix4: use qdev gpio to wire up smi_irq, Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 09/11] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 10/11] hw/isa/piix4.c: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Philippe Mathieu-Daudé, 2022/05/30
- [PATCH v2 11/11] hw/acpi/piix4: remove unused piix4_pm_initfn() function, Philippe Mathieu-Daudé, 2022/05/30