diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2021-11-11 14:08:59 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2021-11-15 11:10:11 -0500 |
| commit | 18416c62e36a79823a9e28f6b2260aa13c25e1d9 (patch) | |
| tree | 80244a43268a1b07ade7a4fe0700baed9e244a98 /softmmu/qdev-monitor.c | |
| parent | 0d33415a4eafe532f3beef8272811d927236a353 (diff) | |
| download | qemu-18416c62e36a79823a9e28f6b2260aa13c25e1d9.zip qemu-18416c62e36a79823a9e28f6b2260aa13c25e1d9.tar.gz qemu-18416c62e36a79823a9e28f6b2260aa13c25e1d9.tar.bz2 | |
pcie: expire pending delete
Add an expire time for pending delete, once the time is over allow
pressing the attention button again.
This makes pcie hotplug behave more like acpi hotplug, where one can
try sending an 'device_del' monitor command again in case the guest
didn't respond to the first attempt.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20211111130859.1171890-7-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'softmmu/qdev-monitor.c')
| -rw-r--r-- | softmmu/qdev-monitor.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 588a62b..5925f1a 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -943,7 +943,9 @@ void qmp_device_del(const char *id, Error **errp) { DeviceState *dev = find_device_state(id, errp); if (dev != NULL) { - if (dev->pending_deleted_event) { + if (dev->pending_deleted_event && + (dev->pending_deleted_expires_ms == 0 || + dev->pending_deleted_expires_ms > qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL))) { error_setg(errp, "Device %s is already in the " "process of unplug", id); return; |