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