[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] pci: mark devices partially unplugged
From: |
Jens Freimann |
Subject: |
[Qemu-devel] [PATCH 8/9] pci: mark devices partially unplugged |
Date: |
Fri, 2 Aug 2019 17:06:04 +0200 |
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>
---
hw/pci/pci.c | 2 ++
hw/pci/pcie.c | 3 +++
include/hw/pci/pci.h | 1 +
3 files changed, 6 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 8076a80ab3..935127a98f 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2074,6 +2074,8 @@ static void pci_qdev_realize(DeviceState *qdev, Error
**errp)
Error *local_err = NULL;
bool is_default_rom;
+ pci_dev->partially_hotplugged = false;
+
/* initialize cap_present for pci_is_express() and pci_config_size(),
* Note that hybrid PCIs are not set automatically and need to manage
* QEMU_PCI_CAP_EXPRESS manually */
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 aaf1b9f70d..e0b82d3ad4 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;
--
2.21.0
- [Qemu-devel] [PATCH 3/9] vfio: unplug failover primary device before migration, (continued)
[Qemu-devel] [PATCH 4/9] migration: allow unplug during migration for failover devices, Jens Freimann, 2019/08/02
[Qemu-devel] [PATCH 5/9] qapi: add unplug primary event, Jens Freimann, 2019/08/02
[Qemu-devel] [PATCH 6/9] qapi: Add failover negotiated event, Jens Freimann, 2019/08/02
[Qemu-devel] [PATCH 7/9] migration: Add new migration state wait-unplug, Jens Freimann, 2019/08/02
[Qemu-devel] [PATCH 8/9] pci: mark devices partially unplugged,
Jens Freimann <=
[Qemu-devel] [PATCH 9/9] pci: mark device having guest unplug request pending, Jens Freimann, 2019/08/02
Re: [Qemu-devel] [PATCH v2 0/9] add failover feature for assigned network devices, Michael S. Tsirkin, 2019/08/02
Re: [Qemu-devel] [PATCH v2 0/9] add failover feature for assigned network devices, no-reply, 2019/08/02
Re: [Qemu-devel] [PATCH v2 0/9] add failover feature for assigned network devices, no-reply, 2019/08/02
Re: [Qemu-devel] [PATCH v2 0/9] add failover feature for assigned network devices, Michael S. Tsirkin, 2019/08/12