yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-s390x-pci-rename-hotplug-handler-callbacks.patch

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