From: Igor Mammedov <imammedo@redhat.com>
To: David Hildenbrand <david@redhat.com>
Cc: qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Alexander Graf <agraf@suse.de>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
qemu-ppc@nongnu.org, David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [Qemu-devel] [PATCH v1 4/7] pci/pcie: route unplug via the hotplug handler
Date: Thu, 1 Nov 2018 15:38:23 +0100 [thread overview]
Message-ID: <20181101153823.1660c3ff@redhat.com> (raw)
In-Reply-To: <20181024101930.20674-5-david@redhat.com>
On Wed, 24 Oct 2018 12:19:27 +0200
David Hildenbrand <david@redhat.com> wrote:
> Preparation for multi-stage hotplug handlers.
commit message needs a rationale shat/why is done here, especially
if it's preliminary refactoring for some future work
(which I'd shortly describe here as well).
The same applies to patches 5-7.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> hw/pci/pcie.c | 10 +++++++++-
> hw/pci/pcie_port.c | 1 +
> include/hw/pci/pcie.h | 2 ++
> 3 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
> index 02a7bf3af5..744727dc0b 100644
> --- a/hw/pci/pcie.c
> +++ b/hw/pci/pcie.c
> @@ -364,11 +364,19 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> }
> }
>
> -static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
> +void pcie_cap_slot_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp)
> {
> object_unparent(OBJECT(dev));
> }
>
> +static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
> +{
> + HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(DEVICE(dev));
> +
> + hotplug_handler_unplug(hotplug_ctrl, DEVICE(dev), &error_abort);
> +}
> +
> void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
> index 13fe6c6945..6e993da603 100644
> --- a/hw/pci/pcie_port.c
> +++ b/hw/pci/pcie_port.c
> @@ -156,6 +156,7 @@ static void pcie_slot_class_init(ObjectClass *oc, void *data)
> dc->props = pcie_slot_props;
> hc->pre_plug = pcie_cap_slot_pre_plug_cb;
> hc->plug = pcie_cap_slot_hotplug_cb;
> + hc->unplug = pcie_cap_slot_hot_unplug_cb;
> hc->unplug_request = pcie_cap_slot_hot_unplug_request_cb;
> }
>
> diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
> index 001d230d7d..b6f05a0e43 100644
> --- a/include/hw/pci/pcie.h
> +++ b/include/hw/pci/pcie.h
> @@ -135,6 +135,8 @@ void pcie_cap_slot_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> Error **errp);
> void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> Error **errp);
> +void pcie_cap_slot_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp);
> void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp);
> #endif /* QEMU_PCIE_H */
next prev parent reply other threads:[~2018-11-01 14:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 10:19 [Qemu-devel] [PATCH v1 0/7] pci: hotplug handler reworks David Hildenbrand
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 1/7] pcihp: perform check for bus capability in pre_plug handler David Hildenbrand
2018-11-01 14:11 ` Igor Mammedov
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 2/7] pcihp: overwrite hotplug handler recursively from the start David Hildenbrand
2018-11-01 14:10 ` Igor Mammedov
2018-11-02 11:43 ` David Hildenbrand
2018-11-02 13:00 ` Igor Mammedov
2018-11-02 13:34 ` David Hildenbrand
2018-11-02 16:28 ` Michael S. Tsirkin
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 3/7] pcihp: route unplug via the hotplug handler David Hildenbrand
2018-11-01 14:21 ` Igor Mammedov
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 4/7] pci/pcie: " David Hildenbrand
2018-11-01 14:38 ` Igor Mammedov [this message]
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 5/7] pci/shpc: move hotplug checks to preplug handler David Hildenbrand
2018-11-05 9:11 ` David Hildenbrand
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 6/7] pci/shpc: route unplug via the hotplug handler David Hildenbrand
2018-10-24 10:19 ` [Qemu-devel] [PATCH v1 7/7] spapr_pci: " David Hildenbrand
2018-10-24 12:50 ` [Qemu-devel] [Qemu-ppc] " Greg Kurz
2018-10-31 17:31 ` [Qemu-devel] [PATCH v1 0/7] pci: hotplug handler reworks David Hildenbrand
2018-11-01 14:55 ` Igor Mammedov
2018-11-01 16:42 ` 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=20181101153823.1660c3ff@redhat.com \
--to=imammedo@redhat.com \
--cc=agraf@suse.de \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/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).