|
 |
ae23c9 |
From d39e15cb0f762201de719f1bf8193dc0f275f6c3 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
ae23c9 |
Date: Wed, 17 Apr 2019 13:57:25 +0100
|
|
|
ae23c9 |
Subject: [PATCH 08/24] s390x/pci: rename hotplug handler callbacks
|
|
|
ae23c9 |
MIME-Version: 1.0
|
|
|
ae23c9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ae23c9 |
Content-Transfer-Encoding: 8bit
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Cornelia Huck <cohuck@redhat.com>
|
|
|
ae23c9 |
Message-id: <20190417135741.25297-9-cohuck@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 85788
|
|
|
ae23c9 |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 08/24] s390x/pci: rename hotplug handler callbacks
|
|
|
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: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
From: David Hildenbrand <david@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
The callbacks are also called for cold plugged devices. Drop the "hot"
|
|
|
ae23c9 |
to better match the actual callback names.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
|
|
|
ae23c9 |
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Pierre Morel<pmorel@linux.ibm.com>
|
|
|
ae23c9 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit fa2a7751172b6228706decfbdddb6eac39052ab1)
|
|
|
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 | 12 ++++++------
|
|
|
ae23c9 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
|
|
|
ae23c9 |
index e6f5d91..9c444b6 100644
|
|
|
ae23c9 |
--- a/hw/s390x/s390-pci-bus.c
|
|
|
ae23c9 |
+++ b/hw/s390x/s390-pci-bus.c
|
|
|
ae23c9 |
@@ -827,8 +827,8 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev)
|
|
|
ae23c9 |
return true;
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
-static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,
|
|
|
ae23c9 |
- DeviceState *dev, Error **errp)
|
|
|
ae23c9 |
+static void s390_pcihost_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
ae23c9 |
+ Error **errp)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
PCIDevice *pdev = NULL;
|
|
|
ae23c9 |
S390PCIBusDevice *pbdev = NULL;
|
|
|
ae23c9 |
@@ -936,8 +936,8 @@ static void s390_pcihost_timer_cb(void *opaque)
|
|
|
ae23c9 |
qdev_unplug(DEVICE(pbdev), NULL);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
-static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev,
|
|
|
ae23c9 |
- DeviceState *dev, Error **errp)
|
|
|
ae23c9 |
+static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
|
|
ae23c9 |
+ Error **errp)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
PCIDevice *pci_dev = NULL;
|
|
|
ae23c9 |
PCIBus *bus;
|
|
|
ae23c9 |
@@ -1045,8 +1045,8 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
dc->reset = s390_pcihost_reset;
|
|
|
ae23c9 |
dc->realize = s390_pcihost_realize;
|
|
|
ae23c9 |
- hc->plug = s390_pcihost_hot_plug;
|
|
|
ae23c9 |
- hc->unplug = s390_pcihost_hot_unplug;
|
|
|
ae23c9 |
+ hc->plug = s390_pcihost_plug;
|
|
|
ae23c9 |
+ hc->unplug = s390_pcihost_unplug;
|
|
|
ae23c9 |
msi_nonbroken = true;
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|