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

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