[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/14] pci: mark devices partially unplugged
From: |
Michael S. Tsirkin |
Subject: |
[PULL 03/14] pci: mark devices partially unplugged |
Date: |
Tue, 29 Oct 2019 19:00:19 -0400 |
From: Jens Freimann <address@hidden>
Only the guest unplug request was triggered. This is needed for
the failover feature. In case of a failed migration we need to
plug the device back to the guest.
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pcie.c | 3 +++
include/hw/pci/pci.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index a6beb567bd..19363ff8ce 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -456,6 +456,9 @@ static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev,
void *opaque)
{
HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(DEVICE(dev));
+ if (dev->partially_hotplugged) {
+ return;
+ }
hotplug_handler_unplug(hotplug_ctrl, DEVICE(dev), &error_abort);
object_unparent(OBJECT(dev));
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 69d1f0228b..db75c6dfd0 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -265,6 +265,7 @@ typedef struct PCIReqIDCache PCIReqIDCache;
struct PCIDevice {
DeviceState qdev;
+ bool partially_hotplugged;
/* PCI config space */
uint8_t *config;
--
MST
- [PULL 00/14] virtio: features, cleanups, Michael S. Tsirkin, 2019/10/29
- [PULL 01/14] qdev/qbus: add hidden device support, Michael S. Tsirkin, 2019/10/29
- [PULL 02/14] pci: add option for net failover, Michael S. Tsirkin, 2019/10/29
- [PULL 03/14] pci: mark devices partially unplugged,
Michael S. Tsirkin <=
- [PULL 04/14] pci: mark device having guest unplug request pending, Michael S. Tsirkin, 2019/10/29
- [PULL 05/14] qapi: add unplug primary event, Michael S. Tsirkin, 2019/10/29
- [PULL 06/14] qapi: add failover negotiated event, Michael S. Tsirkin, 2019/10/29
- [PULL 07/14] migration: allow unplug during migration for failover devices, Michael S. Tsirkin, 2019/10/29
- [PULL 08/14] migration: add new migration state wait-unplug, Michael S. Tsirkin, 2019/10/29
- [PULL 09/14] libqos: tolerate wait-unplug migration state, Michael S. Tsirkin, 2019/10/29
- [PULL 11/14] vfio: unplug failover primary device before migration, Michael S. Tsirkin, 2019/10/29
- [PULL 12/14] virtio/vhost: Use auto_rcu_read macros, Michael S. Tsirkin, 2019/10/29
- [PULL 13/14] virtio_net: use RCU_READ_LOCK_GUARD, Michael S. Tsirkin, 2019/10/29
- [PULL 10/14] net/virtio: add failover support, Michael S. Tsirkin, 2019/10/29