From d39e15cb0f762201de719f1bf8193dc0f275f6c3 Mon Sep 17 00:00:00 2001

From: Cornelia Huck <cohuck@redhat.com>

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

Subject: [PATCH 08/24] s390x/pci: rename hotplug handler callbacks

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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

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

Patchwork-id: 85788

O-Subject: [RHEL-8.1.0 qemu-kvm PATCH v2 08/24] s390x/pci: rename hotplug handler callbacks

Bugzilla: 1699070

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

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

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

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

From: David Hildenbrand <david@redhat.com>

The callbacks are also called for cold plugged devices. Drop the "hot"

to better match the actual callback names.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

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

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

Reviewed-by: Pierre Morel<pmorel@linux.ibm.com>

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

Reviewed-by: Michael S. Tsirkin <mst@redhat.com>

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

(cherry picked from commit fa2a7751172b6228706decfbdddb6eac39052ab1)

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 | 12 ++++++------

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

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

index e6f5d91..9c444b6 100644

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

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

@@ -827,8 +827,8 @@ static bool s390_pci_alloc_idx(S390pciState *s, S390PCIBusDevice *pbdev)

     return true;

 }

-static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,

-                                  DeviceState *dev, Error **errp)

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

+                              Error **errp)

 {

     PCIDevice *pdev = NULL;

     S390PCIBusDevice *pbdev = NULL;

@@ -936,8 +936,8 @@ static void s390_pcihost_timer_cb(void *opaque)

     qdev_unplug(DEVICE(pbdev), NULL);

 }

-static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev,

-                                    DeviceState *dev, Error **errp)

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

+                                Error **errp)

 {

     PCIDevice *pci_dev = NULL;

     PCIBus *bus;

@@ -1045,8 +1045,8 @@ static void s390_pcihost_class_init(ObjectClass *klass, void *data)

     dc->reset = s390_pcihost_reset;

     dc->realize = s390_pcihost_realize;

-    hc->plug = s390_pcihost_hot_plug;

-    hc->unplug = s390_pcihost_hot_unplug;

+    hc->plug = s390_pcihost_plug;

+    hc->unplug = s390_pcihost_unplug;

     msi_nonbroken = true;

 }

-- 

1.8.3.1