[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/16] remove function during multi-function hot-add
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 15/16] remove function during multi-function hot-add |
Date: |
Thu, 29 Oct 2015 11:40:03 +0200 |
From: Cao jin <address@hidden>
In case user want to cancel the hot-add operation, should roll back,
device_del the added function that still don`t work.
Signed-off-by: Cao jin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pcie.c | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 6e28985..a72d516 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -261,13 +261,31 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler
*hotplug_dev, DeviceState *dev,
PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP);
}
+static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
+{
+ object_unparent(OBJECT(dev));
+}
+
void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
uint8_t *exp_cap;
+ PCIDevice *pci_dev = PCI_DEVICE(dev);
+ PCIBus *bus = pci_dev->bus;
pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp);
+ /* In case user cancel the operation of multi-function hot-add,
+ * remove the function that is unexposed to guest individually,
+ * without interaction with guest.
+ */
+ if (pci_dev->devfn &&
+ !bus->devices[0]) {
+ pcie_unplug_device(bus, pci_dev, NULL);
+
+ return;
+ }
+
pcie_cap_slot_push_attention_button(PCI_DEVICE(hotplug_dev));
}
@@ -378,11 +396,6 @@ void pcie_cap_slot_reset(PCIDevice *dev)
hotplug_event_update_event_status(dev);
}
-static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
-{
- object_unparent(OBJECT(dev));
-}
-
void pcie_cap_slot_write_config(PCIDevice *dev,
uint32_t addr, uint32_t val, int len)
{
--
MST
- [Qemu-devel] [PULL 04/16] pc: memhp: do not emit inserting event for coldplugged DIMMs, (continued)
- [Qemu-devel] [PULL 04/16] pc: memhp: do not emit inserting event for coldplugged DIMMs, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 05/16] mmap-alloc: fix error handling, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 06/16] virtio: introduce virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 07/16] virtio: switch to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 10/16] virtio-scsi: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 12/16] Revert "pc: memhp: force gaps between DIMM's GPA", Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 11/16] virtio: drop virtqueue_map_sg, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 09/16] virtio-serial: convert to virtio_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 08/16] virtio-blk: convert to virtqueue_map, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 13/16] Revert "memhp: extend address auto assignment to support gaps", Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 15/16] remove function during multi-function hot-add,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 14/16] tests/vhost-user-bridge: add vhost-user bridge application, Michael S. Tsirkin, 2015/10/29
- [Qemu-devel] [PULL 16/16] enable multi-function hot-add, Michael S. Tsirkin, 2015/10/29
- Re: [Qemu-devel] [PULL 00/16] virtio, pc, memory: fixes+features for 2.5, Peter Maydell, 2015/10/29