From: Jens Freimann <jfreimann@redhat.com>
To: qemu-devel@nongnu.org
Cc: pkrempa@redhat.com, berrange@redhat.com, ehabkost@redhat.com,
mst@redhat.com, aadam@redhat.com, jasowang@redhat.com,
dgilbert@redhat.com, armbru@redhat.com,
alex.williamson@redhat.com, laine@redhat.com, ailan@redhat.com,
parav@mellanox.com
Subject: [PATCH v6 07/11] migration: allow unplug during migration for failover devices
Date: Fri, 25 Oct 2019 14:19:26 +0200 [thread overview]
Message-ID: <20191025121930.6855-8-jfreimann@redhat.com> (raw)
In-Reply-To: <20191025121930.6855-1-jfreimann@redhat.com>
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>
Acked-by: Cornelia Huck <cohuck@redhat.com>
---
hw/core/qdev.c | 1 +
hw/pci/pci.c | 1 +
include/hw/qdev-core.h | 1 +
qdev-monitor.c | 2 +-
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 3b8d43d0fd..cf1ba28fe3 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 824ab4ed7b..c68498c0de 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 710981af36..1518495b1e 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 ffa08c670f..e6b112eb0a 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;
}
--
2.21.0
next prev parent reply other threads:[~2019-10-25 12:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 12:19 [PATCH v6 0/11] add failover feature for assigned network devices Jens Freimann
2019-10-25 12:19 ` [PATCH v6 01/11] qdev/qbus: add hidden device support Jens Freimann
2019-10-25 17:34 ` Dr. David Alan Gilbert
2019-10-25 12:19 ` [PATCH v6 02/11] pci: add option for net failover Jens Freimann
2019-10-25 12:19 ` [PATCH v6 03/11] pci: mark devices partially unplugged Jens Freimann
2019-10-25 12:19 ` [PATCH v6 04/11] pci: mark device having guest unplug request pending Jens Freimann
2019-10-25 12:19 ` [PATCH v6 05/11] qapi: add unplug primary event Jens Freimann
2019-10-25 12:19 ` [PATCH v6 06/11] qapi: add failover negotiated event Jens Freimann
2019-10-25 14:03 ` Markus Armbruster
2019-10-25 17:39 ` Jens Freimann
2019-10-29 12:13 ` Markus Armbruster
2019-10-29 22:41 ` Michael S. Tsirkin
2019-10-30 10:09 ` Jens Freimann
2019-10-25 12:19 ` Jens Freimann [this message]
2019-10-25 12:19 ` [PATCH v6 08/11] migration: add new migration state wait-unplug Jens Freimann
2019-10-29 2:56 ` Dr. David Alan Gilbert
2019-10-29 5:51 ` Jens Freimann
2019-10-29 7:09 ` Dr. David Alan Gilbert
2019-10-25 12:19 ` [PATCH v6 09/11] libqos: tolerate wait-unplug migration state Jens Freimann
2019-10-25 12:19 ` [PATCH v6 10/11] net/virtio: add failover support Jens Freimann
2019-10-25 12:19 ` [PATCH v6 11/11] vfio: unplug failover primary device before migration Jens Freimann
2019-10-25 15:23 ` [PATCH v6 0/11] add failover feature for assigned network devices Roman Kagan
2019-10-28 10:27 ` Jens Freimann
2019-10-28 15:58 ` Michael S. Tsirkin
2019-10-29 11:18 ` Jens Freimann
2019-10-29 22:49 ` 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=20191025121930.6855-8-jfreimann@redhat.com \
--to=jfreimann@redhat.com \
--cc=aadam@redhat.com \
--cc=ailan@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jasowang@redhat.com \
--cc=laine@redhat.com \
--cc=mst@redhat.com \
--cc=parav@mellanox.com \
--cc=pkrempa@redhat.com \
--cc=qemu-devel@nongnu.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).