From: David Gibson <david@gibson.dropbear.id.au>
To: David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org, "Michael S . Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Alexander Graf <agraf@suse.de>,
Eduardo Habkost <ehabkost@redhat.com>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
Richard Henderson <rth@twiddle.net>,
qemu-ppc@nongnu.org, qemu-s390x@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 02/10] pci/shpc: rename hotplug handler callbacks
Date: Tue, 6 Nov 2018 19:14:02 +1100 [thread overview]
Message-ID: <20181106081401.GC3539@umbus.fritz.box> (raw)
In-Reply-To: <20181105102044.20547-3-david@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 8895 bytes --]
On Mon, Nov 05, 2018 at 11:20:36AM +0100, David Hildenbrand wrote:
> The callbacks are also called for cold plugged devices. Drop the "hot"
> to better match the actual callback names.
>
> While at it, also rename shpc_device_hotplug_common() to
> shpc_device_plug_common().
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
> ---
> hw/pci-bridge/pci_bridge_dev.c | 17 ++++++++---------
> hw/pci-bridge/pcie_pci_bridge.c | 17 ++++++++---------
> hw/pci/shpc.c | 14 +++++++-------
> include/hw/pci/shpc.h | 8 ++++----
> 4 files changed, 27 insertions(+), 29 deletions(-)
>
> diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
> index 97a8e8b6a4..e1df9a52ac 100644
> --- a/hw/pci-bridge/pci_bridge_dev.c
> +++ b/hw/pci-bridge/pci_bridge_dev.c
> @@ -206,8 +206,8 @@ static const VMStateDescription pci_bridge_dev_vmstate = {
> }
> };
>
> -static void pci_bridge_dev_hotplug_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev, Error **errp)
> +static void pci_bridge_dev_plug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> {
> PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
>
> @@ -216,12 +216,11 @@ static void pci_bridge_dev_hotplug_cb(HotplugHandler *hotplug_dev,
> "this %s", TYPE_PCI_BRIDGE_DEV);
> return;
> }
> - shpc_device_hotplug_cb(hotplug_dev, dev, errp);
> + shpc_device_plug_cb(hotplug_dev, dev, errp);
> }
>
> -static void pci_bridge_dev_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev,
> - Error **errp)
> +static void pci_bridge_dev_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> {
> PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
>
> @@ -230,7 +229,7 @@ static void pci_bridge_dev_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> "this %s", TYPE_PCI_BRIDGE_DEV);
> return;
> }
> - shpc_device_hot_unplug_request_cb(hotplug_dev, dev, errp);
> + shpc_device_unplug_request_cb(hotplug_dev, dev, errp);
> }
>
> static void pci_bridge_dev_class_init(ObjectClass *klass, void *data)
> @@ -251,8 +250,8 @@ static void pci_bridge_dev_class_init(ObjectClass *klass, void *data)
> dc->props = pci_bridge_dev_properties;
> dc->vmsd = &pci_bridge_dev_vmstate;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> - hc->plug = pci_bridge_dev_hotplug_cb;
> - hc->unplug_request = pci_bridge_dev_hot_unplug_request_cb;
> + hc->plug = pci_bridge_dev_plug_cb;
> + hc->unplug_request = pci_bridge_dev_unplug_request_cb;
> }
>
> static const TypeInfo pci_bridge_dev_info = {
> diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c
> index 04cf5a6a92..c634353b06 100644
> --- a/hw/pci-bridge/pcie_pci_bridge.c
> +++ b/hw/pci-bridge/pcie_pci_bridge.c
> @@ -137,8 +137,8 @@ static const VMStateDescription pcie_pci_bridge_dev_vmstate = {
> }
> };
>
> -static void pcie_pci_bridge_hotplug_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev, Error **errp)
> +static void pcie_pci_bridge_plug_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> {
> PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
>
> @@ -147,12 +147,11 @@ static void pcie_pci_bridge_hotplug_cb(HotplugHandler *hotplug_dev,
> "this %s", TYPE_PCIE_PCI_BRIDGE_DEV);
> return;
> }
> - shpc_device_hotplug_cb(hotplug_dev, dev, errp);
> + shpc_device_plug_cb(hotplug_dev, dev, errp);
> }
>
> -static void pcie_pci_bridge_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev,
> - Error **errp)
> +static void pcie_pci_bridge_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> {
> PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
>
> @@ -161,7 +160,7 @@ static void pcie_pci_bridge_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> "this %s", TYPE_PCIE_PCI_BRIDGE_DEV);
> return;
> }
> - shpc_device_hot_unplug_request_cb(hotplug_dev, dev, errp);
> + shpc_device_unplug_request_cb(hotplug_dev, dev, errp);
> }
>
> static void pcie_pci_bridge_class_init(ObjectClass *klass, void *data)
> @@ -180,8 +179,8 @@ static void pcie_pci_bridge_class_init(ObjectClass *klass, void *data)
> dc->props = pcie_pci_bridge_dev_properties;
> dc->reset = &pcie_pci_bridge_reset;
> set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> - hc->plug = pcie_pci_bridge_hotplug_cb;
> - hc->unplug_request = pcie_pci_bridge_hot_unplug_request_cb;
> + hc->plug = pcie_pci_bridge_plug_cb;
> + hc->unplug_request = pcie_pci_bridge_unplug_request_cb;
> }
>
> static const TypeInfo pcie_pci_bridge_info = {
> diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
> index a8462d48bb..098ffaef1d 100644
> --- a/hw/pci/shpc.c
> +++ b/hw/pci/shpc.c
> @@ -482,8 +482,8 @@ static const MemoryRegionOps shpc_mmio_ops = {
> .max_access_size = 4,
> },
> };
> -static void shpc_device_hotplug_common(PCIDevice *affected_dev, int *slot,
> - SHPCDevice *shpc, Error **errp)
> +static void shpc_device_plug_common(PCIDevice *affected_dev, int *slot,
> + SHPCDevice *shpc, Error **errp)
> {
> int pci_slot = PCI_SLOT(affected_dev->devfn);
> *slot = SHPC_PCI_TO_IDX(pci_slot);
> @@ -497,7 +497,7 @@ static void shpc_device_hotplug_common(PCIDevice *affected_dev, int *slot,
> }
> }
>
> -void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> +void shpc_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> Error **errp)
> {
> Error *local_err = NULL;
> @@ -505,7 +505,7 @@ void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> SHPCDevice *shpc = pci_hotplug_dev->shpc;
> int slot;
>
> - shpc_device_hotplug_common(PCI_DEVICE(dev), &slot, shpc, &local_err);
> + shpc_device_plug_common(PCI_DEVICE(dev), &slot, shpc, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> return;
> @@ -540,8 +540,8 @@ void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> shpc_interrupt_update(pci_hotplug_dev);
> }
>
> -void shpc_device_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev, Error **errp)
> +void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp)
> {
> Error *local_err = NULL;
> PCIDevice *pci_hotplug_dev = PCI_DEVICE(hotplug_dev);
> @@ -550,7 +550,7 @@ void shpc_device_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> uint8_t led;
> int slot;
>
> - shpc_device_hotplug_common(PCI_DEVICE(dev), &slot, shpc, &local_err);
> + shpc_device_plug_common(PCI_DEVICE(dev), &slot, shpc, &local_err);
> if (local_err) {
> error_propagate(errp, local_err);
> return;
> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
> index ee19fecf61..71293aca58 100644
> --- a/include/hw/pci/shpc.h
> +++ b/include/hw/pci/shpc.h
> @@ -45,10 +45,10 @@ void shpc_free(PCIDevice *dev);
> void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len);
>
>
> -void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> - Error **errp);
> -void shpc_device_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> - DeviceState *dev, Error **errp);
> +void shpc_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp);
> +void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev,
> + DeviceState *dev, Error **errp);
>
> extern VMStateInfo shpc_vmstate_info;
> #define SHPC_VMSTATE(_field, _type, _test) \
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2018-11-06 8:19 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-05 10:20 [Qemu-devel] [PATCH v2 00/10] pci: hotplug handler reworks David Hildenbrand
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 01/10] pci/pcie: rename hotplug handler callbacks David Hildenbrand
2018-11-06 6:03 ` David Gibson
2018-11-06 8:43 ` David Hildenbrand
2018-11-19 15:43 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 02/10] pci/shpc: " David Hildenbrand
2018-11-06 8:14 ` David Gibson [this message]
2018-11-19 15:56 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 03/10] s390x/pci: " David Hildenbrand
2018-11-06 8:14 ` David Gibson
2018-11-08 12:38 ` Cornelia Huck
2018-11-19 15:59 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 04/10] pci/pcie: stop plug/unplug if the slot is locked David Hildenbrand
2018-11-06 23:10 ` David Gibson
2018-11-07 9:03 ` David Hildenbrand
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 05/10] pci/pcihp: perform check for bus capability in pre_plug handler David Hildenbrand
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 06/10] pci/pcihp: overwrite hotplug handler recursively from the start David Hildenbrand
2018-11-19 16:31 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 07/10] pci/pcihp: perform unplug via the hotplug handler David Hildenbrand
2018-11-19 16:36 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 08/10] pci/pcie: " David Hildenbrand
2018-11-07 0:55 ` David Gibson
2018-11-19 16:46 ` Igor Mammedov
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 09/10] pci/shpc: " David Hildenbrand
2018-11-07 0:59 ` David Gibson
2018-11-19 17:09 ` Igor Mammedov
2018-11-20 10:11 ` David Hildenbrand
2018-11-20 14:13 ` Igor Mammedov
2018-11-20 14:34 ` David Hildenbrand
2018-11-05 10:20 ` [Qemu-devel] [PATCH v2 10/10] spapr_pci: " David Hildenbrand
2018-11-05 10:31 ` [Qemu-devel] [Qemu-ppc] " Greg Kurz
2018-11-05 10:33 ` David Hildenbrand
2018-11-07 4:22 ` [Qemu-devel] " David Gibson
2018-11-08 3:08 ` [Qemu-devel] QEMU bootup hang in tcg model using mainline QEMU code gengdongjiu
2018-11-19 17:13 ` [Qemu-devel] [PATCH v2 10/10] spapr_pci: perform unplug via the hotplug handler Igor Mammedov
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=20181106081401.GC3539@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--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 \
/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).