aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Suvorova <jusual@redhat.com>2020-02-20 17:55:56 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2020-02-25 09:18:01 +0100
commitcce8944cc9efab47d4bf29cfffb3470371c3541b (patch)
treeed52680cf5a3703955a0c34ab8bcd23d725928e4
parent037fb5eb3941c80a2b7c36a843e47207ddb004d4 (diff)
downloadqemu-arm-cce8944cc9efab47d4bf29cfffb3470371c3541b.tar.gz
qdev-monitor: Forbid repeated device_del
Device unplug can be done asynchronously. Thus, sending the second device_del before the previous unplug is complete may lead to unexpected results. On PCIe devices, this cancels the hot-unplug process. Signed-off-by: Julia Suvorova <jusual@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20200220165556.39388-1-jusual@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--qdev-monitor.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 8ce71a206b..8a2a9538cd 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -887,6 +887,12 @@ void qmp_device_del(const char *id, Error **errp)
{
DeviceState *dev = find_device_state(id, errp);
if (dev != NULL) {
+ if (dev->pending_deleted_event) {
+ error_setg(errp, "Device %s is already in the "
+ "process of unplug", id);
+ return;
+ }
+
qdev_unplug(dev, errp);
}
}