diff options
| author | Jens Freimann <jfreimann@redhat.com> | 2019-10-29 12:49:01 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-10-29 18:55:26 -0400 |
| commit | a1190ab628c0e2816eae42786cd7396d6638aa48 (patch) | |
| tree | 17b7cebe7fa91d106f14862fc2f68965548c2eb5 | |
| parent | 70d04971f1ec71ba01c3dc5d4c760fa2c87e2612 (diff) | |
| download | qemu-a1190ab628c0e2816eae42786cd7396d6638aa48.zip qemu-a1190ab628c0e2816eae42786cd7396d6638aa48.tar.gz qemu-a1190ab628c0e2816eae42786cd7396d6638aa48.tar.bz2 | |
migration: allow unplug during migration for failover devices
In "b06424de62 migration: Disable hotplug/unplug during migration" we
added a check to disable unplug for all devices until we have figured
out what works. For failover primary devices qdev_unplug() is called
from the migration handler, i.e. during migration.
This patch adds a flag to DeviceState which is set to false for all
devices and makes an exception for PCI devices that are also
primary devices in a failover pair.
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
Message-Id: <20191029114905.6856-8-jfreimann@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/core/qdev.c | 1 | ||||
| -rw-r--r-- | hw/pci/pci.c | 1 | ||||
| -rw-r--r-- | include/hw/qdev-core.h | 1 | ||||
| -rw-r--r-- | qdev-monitor.c | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 3b8d43d..cf1ba28 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -996,6 +996,7 @@ static void device_initfn(Object *obj) dev->instance_id_alias = -1; dev->realized = false; + dev->allow_unplug_during_migration = false; object_property_add_bool(obj, "realized", device_get_realized, device_set_realized, NULL); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 824ab4e..c68498c 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2130,6 +2130,7 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) pci_qdev_unrealize(DEVICE(pci_dev), NULL); return; } + qdev->allow_unplug_during_migration = true; } /* rom loading */ diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 710981a..1518495 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -156,6 +156,7 @@ struct DeviceState { bool pending_deleted_event; QemuOpts *opts; int hotplugged; + bool allow_unplug_during_migration; BusState *parent_bus; QLIST_HEAD(, NamedGPIOList) gpios; QLIST_HEAD(, BusState) child_bus; diff --git a/qdev-monitor.c b/qdev-monitor.c index ffa08c6..e6b112e 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -851,7 +851,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) return; } - if (!migration_is_idle()) { + if (!migration_is_idle() && !dev->allow_unplug_during_migration) { error_setg(errp, "device_del not allowed while migrating"); return; } |