diff options
| author | David Hildenbrand <david@redhat.com> | 2019-01-14 11:31:07 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-01-18 11:52:01 +0100 |
| commit | d648a3e62d5e726526f9df283341999792f4fbf9 (patch) | |
| tree | 45037eac6fe268b77a8ad3c4dfafa685e9f7de3e | |
| parent | 6069bcdeaceebb91f43bc4762e3f63eee48cd390 (diff) | |
| download | qemu-d648a3e62d5e726526f9df283341999792f4fbf9.zip | |
s390x/pci: Always delete and free the release_timer
We should always get rid of it. I don't see a reason to keep the timer
alive if the devices are going away. This looks like a memory leak.
(hmp) device_add virtio-mouse-pci,id=test
(hmp) device_del test
-> guest notified, timer pending.
-> guest does not react for some reason (e.g. crash)
-> s390_pcihost_timer_cb(). Timer not pending anymore. qmp_unplug().
-> Device deleted. Timer expired (not pending) but not freed.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20190114103110.10909-4-david@redhat.com>
Reviewed-by: Collin Walling <walling@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index c467cc526b..e5a4cf03b2 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -986,7 +986,7 @@ static void s390_pcihost_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, return; } - if (pbdev->release_timer && timer_pending(pbdev->release_timer)) { + if (pbdev->release_timer) { timer_del(pbdev->release_timer); timer_free(pbdev->release_timer); pbdev->release_timer = NULL; |