qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S . Tsirkin" <mst@redhat.com>,
	David Gibson <david@gibson.dropbear.id.au>,
	Greg Kurz <groug@kaod.org>, Igor Mammedov <imammedo@redhat.com>,
	Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>,
	Collin Walling <walling@linux.ibm.com>,
	Thomas Huth <thuth@redhat.com>,
	qemu-ppc@nongnu.org, David Hildenbrand <david@redhat.com>
Subject: [Qemu-devel] [PATCH v3 03/11] s390x/pci: rename hotplug handler callbacks
Date: Tue, 20 Nov 2018 12:04:19 +0100	[thread overview]
Message-ID: <20181120110427.7321-4-david@redhat.com> (raw)
In-Reply-To: <20181120110427.7321-1-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>
Signed-off-by: David Hildenbrand <david@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 060ff062bc..9abd49a9dc 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;
 }
 
-- 
2.17.2

  parent reply	other threads:[~2018-11-20 11:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-20 11:04 [Qemu-devel] [PATCH v3 00/11] pci: hotplug handler reworks David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 01/11] pci/pcie: rename hotplug handler callbacks David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 02/11] pci/shpc: " David Hildenbrand
2018-11-20 11:04 ` David Hildenbrand [this message]
2018-11-23 15:07   ` [Qemu-devel] [PATCH v3 03/11] s390x/pci: " Pierre Morel
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 04/11] pci/pcie: stop plug/unplug if the slot is locked David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 05/11] pci/pcihp: perform check for bus capability in pre_plug handler David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 06/11] pci/pcihp: overwrite hotplug handler recursively from the start David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 07/11] pci/pcihp: perform unplug via the hotplug handler David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 08/11] pci/pcie: " David Hildenbrand
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 09/11] pci: Reuse pci-bridge hotplug handler handlers for pcie-pci-bridge David Hildenbrand
2018-11-20 15:15   ` Igor Mammedov
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 10/11] pci/shpc: perform unplug via the hotplug handler David Hildenbrand
2018-11-20 15:19   ` Igor Mammedov
2018-11-20 11:04 ` [Qemu-devel] [PATCH v3 11/11] spapr_pci: " David Hildenbrand
2018-11-21 12:43 ` [Qemu-devel] [PATCH v3 00/11] pci: hotplug handler reworks David Hildenbrand
2018-11-21 13:28   ` Michael S. Tsirkin
2018-11-21 16:26     ` David Hildenbrand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181120110427.7321-4-david@redhat.com \
    --to=david@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@gibson.dropbear.id.au \
    --cc=groug@kaod.org \
    --cc=imammedo@redhat.com \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    --cc=walling@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).