Blame SOURCES/kvm-s390x-pci-Use-hotplug_dev-instead-of-looking-up-the-.patch

Pablo Greco e6a3ae
From 3fb1ffd096f874877f93af29697a5ff4038b014d Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Date: Wed, 17 Apr 2019 13:57:31 +0100
Pablo Greco e6a3ae
Subject: [PATCH 14/24] s390x/pci: Use hotplug_dev instead of looking up the
Pablo Greco e6a3ae
 host bridge
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Message-id: <20190417135741.25297-15-cohuck@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 85789
Pablo Greco e6a3ae
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 14/24] s390x/pci: Use hotplug_dev instead of looking up the host bridge
Pablo Greco e6a3ae
Bugzilla: 1699070
Pablo Greco e6a3ae
RH-Acked-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
From: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
We directly have it in our hands.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: David Hildenbrand <david@redhat.com>
Pablo Greco e6a3ae
Message-Id: <20190114103110.10909-2-david@redhat.com>
Pablo Greco e6a3ae
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
(cherry picked from commit 19375e9be0ccb7ec02dffbc6ffceafd3c480b799)
Pablo Greco e6a3ae
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 hw/s390x/s390-pci-bus.c | 4 ++--
Pablo Greco e6a3ae
 1 file changed, 2 insertions(+), 2 deletions(-)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
index 24a0d78..f1b3334 100644
Pablo Greco e6a3ae
--- a/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
+++ b/hw/s390x/s390-pci-bus.c
Pablo Greco e6a3ae
@@ -830,9 +830,9 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev)
Pablo Greco e6a3ae
 static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Pablo Greco e6a3ae
                               Error **errp)
Pablo Greco e6a3ae
 {
Pablo Greco e6a3ae
+    S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev);
Pablo Greco e6a3ae
     PCIDevice *pdev = NULL;
Pablo Greco e6a3ae
     S390PCIBusDevice *pbdev = NULL;
Pablo Greco e6a3ae
-    S390pciState *s = s390_get_phb();
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
     if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {
Pablo Greco e6a3ae
         BusState *bus;
Pablo Greco e6a3ae
@@ -941,11 +941,11 @@ static void s390_pcihost_timer_cb(void *opaque)
Pablo Greco e6a3ae
 static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
Pablo Greco e6a3ae
                                 Error **errp)
Pablo Greco e6a3ae
 {
Pablo Greco e6a3ae
+    S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev);
Pablo Greco e6a3ae
     PCIDevice *pci_dev = NULL;
Pablo Greco e6a3ae
     PCIBus *bus;
Pablo Greco e6a3ae
     int32_t devfn;
Pablo Greco e6a3ae
     S390PCIBusDevice *pbdev = NULL;
Pablo Greco e6a3ae
-    S390pciState *s = s390_get_phb();
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
     if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {
Pablo Greco e6a3ae
         error_setg(errp, "PCI bridge hot unplug currently not supported");
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae