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