From 3fb1ffd096f874877f93af29697a5ff4038b014d Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

Date: Wed, 17 Apr 2019 13:57:31 +0100

Subject: [PATCH 14/24] s390x/pci: Use hotplug_dev instead of looking up the

 host bridge

RH-Author: Cornelia Huck <cohuck@redhat.com>

Message-id: <20190417135741.25297-15-cohuck@redhat.com>

Patchwork-id: 85789

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 14/24] s390x/pci: Use hotplug_dev instead of looking up the host bridge

Bugzilla: 1699070

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: David Hildenbrand <david@redhat.com>

We directly have it in our hands.

Signed-off-by: David Hildenbrand <david@redhat.com>

Message-Id: <20190114103110.10909-2-david@redhat.com>

Reviewed-by: Collin Walling <walling@linux.ibm.com>

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 19375e9be0ccb7ec02dffbc6ffceafd3c480b799)

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 hw/s390x/s390-pci-bus.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c

index 24a0d78..f1b3334 100644

--- a/hw/s390x/s390-pci-bus.c

+++ b/hw/s390x/s390-pci-bus.c

@@ -830,9 +830,9 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev)

 static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,

                               Error **errp)

 {

+    S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev);

     PCIDevice *pdev = NULL;

     S390PCIBusDevice *pbdev = NULL;

-    S390pciState *s = s390_get_phb();

     if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {

         BusState *bus;

@@ -941,11 +941,11 @@ static void s390_pcihost_timer_cb(void *opaque)

 static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,

                                 Error **errp)

 {

+    S390pciState *s = S390_PCI_HOST_BRIDGE(hotplug_dev);

     PCIDevice *pci_dev = NULL;

     PCIBus *bus;

     int32_t devfn;

     S390PCIBusDevice *pbdev = NULL;

-    S390pciState *s = s390_get_phb();

     if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_BRIDGE)) {

         error_setg(errp, "PCI bridge hot unplug currently not supported");

-- 

1.8.3.1