From: Anthony PERARD <anthony.perard@citrix.com>
To: QEMU-devel <qemu-devel@nongnu.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Anthony Liguori <anthony@codemonkey.ws>,
Xen Devel <xen-devel@lists.xen.org>
Subject: [Qemu-devel] [PATCH 3/4] pci: Add force_unplug callback.
Date: Tue, 15 May 2012 16:26:38 +0100 [thread overview]
Message-ID: <1337095599-28836-4-git-send-email-anthony.perard@citrix.com> (raw)
In-Reply-To: <1337095599-28836-1-git-send-email-anthony.perard@citrix.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
hw/pci.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index b706e69..c58bbc1 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1518,7 +1518,7 @@ static int pci_qdev_init(DeviceState *qdev)
return 0;
}
-static int pci_unplug_device(DeviceState *qdev)
+static int pci_unplug_device_common(DeviceState *qdev, PCIHotplugState state)
{
PCIDevice *dev = PCI_DEVICE(qdev);
PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
@@ -1529,7 +1529,17 @@ static int pci_unplug_device(DeviceState *qdev)
}
object_unparent(OBJECT(dev));
return dev->bus->hotplug(dev->bus->hotplug_qdev, dev,
- PCI_HOTPLUG_DISABLED);
+ state);
+}
+
+static int pci_unplug_device(DeviceState *qdev)
+{
+ return pci_unplug_device_common(qdev, PCI_HOTPLUG_DISABLED);
+}
+
+static int pci_force_unplug_device(DeviceState *qdev)
+{
+ return pci_unplug_device_common(qdev, PCI_FORCE_EJECT);
}
PCIDevice *pci_create_multifunction(PCIBus *bus, int devfn, bool multifunction,
@@ -2000,6 +2010,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data)
DeviceClass *k = DEVICE_CLASS(klass);
k->init = pci_qdev_init;
k->unplug = pci_unplug_device;
+ k->force_unplug = pci_force_unplug_device;
k->exit = pci_unregister_device;
k->bus_info = &pci_bus_info;
}
--
Anthony PERARD
next prev parent reply other threads:[~2012-05-15 15:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-15 15:26 [Qemu-devel] [PATCH 1.1 0/4] Xen: Fix PV-on-HVM Anthony PERARD
2012-05-15 15:26 ` [Qemu-devel] [PATCH 1/4] Introduce a new hotplug state: Force eject Anthony PERARD
2012-05-15 18:19 ` Stefano Stabellini
2012-05-15 18:25 ` Anthony PERARD
2012-05-15 20:52 ` Michael S. Tsirkin
2012-05-16 10:32 ` Stefano Stabellini
2012-05-16 11:15 ` Anthony PERARD
2012-05-16 11:23 ` Paolo Bonzini
2012-05-16 11:37 ` Anthony PERARD
2012-05-16 13:20 ` Michael S. Tsirkin
2012-05-16 15:52 ` Paolo Bonzini
2012-05-16 16:25 ` Michael S. Tsirkin
2012-05-16 16:02 ` Anthony Liguori
2012-05-16 16:24 ` Michael S. Tsirkin
2012-05-15 15:26 ` [Qemu-devel] [PATCH 2/4] qdev: Introduce qdev_force_unplug Anthony PERARD
2012-05-15 18:15 ` Stefano Stabellini
2012-05-15 18:22 ` Anthony PERARD
2012-05-15 15:26 ` Anthony PERARD [this message]
2012-05-15 15:26 ` [Qemu-devel] [PATCH 4/4] xen: Fix PV-on-HVM Anthony PERARD
2012-05-15 21:00 ` Michael S. Tsirkin
2012-05-16 8:06 ` Paolo Bonzini
2012-05-16 8:13 ` Michael S. Tsirkin
2012-05-16 8:42 ` Paolo Bonzini
2012-05-16 10:19 ` Stefano Stabellini
2012-05-16 10:30 ` Michael S. Tsirkin
2012-05-16 10:37 ` Stefano Stabellini
2012-05-16 13:24 ` Michael S. Tsirkin
2012-05-15 16:26 ` [Qemu-devel] [PATCH 1.1 0/4] Xen: " Anthony Liguori
2012-05-15 16:42 ` Stefano Stabellini
2012-05-15 18:20 ` Stefano Stabellini
2012-05-15 21:06 ` Michael S. Tsirkin
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=1337095599-28836-4-git-send-email-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=anthony@codemonkey.ws \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.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).