[qemu-xen master] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen"

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[qemu-xen master] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen"

patchbot
commit f5a4c84a5d6b19c154abed4ee0380a6f8fd98c60
Author:     Anthony PERARD <[hidden email]>
AuthorDate: Wed Sep 6 14:40:33 2017 +0100
Commit:     Anthony PERARD <[hidden email]>
CommitDate: Mon Sep 11 10:44:43 2017 +0100

    Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen"
   
    This reverts commit 153eba4726dfa1bdfc31d1fe973b2a61b9035492.
   
    This patch prevents PCI passthrough hotplug on Xen. Even if the Xen tool
    stack prepares its own ACPI tables, we still rely on QEMU for hotplug
    ACPI notifications.
   
    The original issue is fixed by the two previous patch:
      hw/acpi: Limit hotplug to root bus on legacy mode
      hw/acpi: Move acpi_set_pci_info to pcihp
   
    Signed-off-by: Anthony PERARD <[hidden email]>
    Reviewed-by: Michael S. Tsirkin <[hidden email]>
    Signed-off-by: Michael S. Tsirkin <[hidden email]>
    (cherry picked from commit 2bed1ba77fae50bc8b5e68ede2d80b652b30c3b8)
---
 hw/acpi/piix4.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index f276967..f4fd590 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -385,10 +385,7 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev,
                                 dev, errp);
         }
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
-        if (!xen_enabled()) {
-            acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
-                                      errp);
-        }
+        acpi_pcihp_device_plug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev, errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
         if (s->cpu_hotplug_legacy) {
             legacy_acpi_cpu_plug_cb(hotplug_dev, &s->gpe_cpu, dev, errp);
@@ -411,10 +408,8 @@ static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev,
         acpi_memory_unplug_request_cb(hotplug_dev, &s->acpi_memory_hotplug,
                                       dev, errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
-        if (!xen_enabled()) {
-            acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
-                                        errp);
-        }
+        acpi_pcihp_device_unplug_cb(hotplug_dev, &s->acpi_pci_hotplug, dev,
+                                    errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
                !s->cpu_hotplug_legacy) {
         acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, errp);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog