aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPan Nengyuan <pannengyuan@huawei.com>2020-01-17 15:55:46 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2020-01-24 20:59:10 +0100
commitc9c0ed6976986826773400032b2411dd8d1b1763 (patch)
tree96d171957ed29b793da699af95a9df921904223f
parent32c87d70ff55b96741f08c35108935cac6f40fe4 (diff)
downloadqemu-c9c0ed6976986826773400032b2411dd8d1b1763.zip
qemu-c9c0ed6976986826773400032b2411dd8d1b1763.tar.gz
qemu-c9c0ed6976986826773400032b2411dd8d1b1763.tar.bz2
virtio-scsi: delete vqs in unrealize to avoid memleaks
This patch fix memleaks when attaching/detaching virtio-scsi device, the memory leak stack is as follow: Direct leak of 21504 byte(s) in 3 object(s) allocated from: #0 0x7f491f2f2970 (/lib64/libasan.so.5+0xef970) ??:? #1 0x7f491e94649d (/lib64/libglib-2.0.so.0+0x5249d) ??:? #2 0x564d0f3919fa (./x86_64-softmmu/qemu-system-x86_64+0x2c3e9fa) /mnt/sdb/qemu/hw/virtio/virtio.c:2333 #3 0x564d0f2eca55 (./x86_64-softmmu/qemu-system-x86_64+0x2b99a55) /mnt/sdb/qemu/hw/scsi/virtio-scsi.c:912 #4 0x564d0f2ece7b (./x86_64-softmmu/qemu-system-x86_64+0x2b99e7b) /mnt/sdb/qemu/hw/scsi/virtio-scsi.c:924 #5 0x564d0f39ee47 (./x86_64-softmmu/qemu-system-x86_64+0x2c4be47) /mnt/sdb/qemu/hw/virtio/virtio.c:3531 #6 0x564d0f980224 (./x86_64-softmmu/qemu-system-x86_64+0x322d224) /mnt/sdb/qemu/hw/core/qdev.c:865 Reported-by: Euler Robot <euler.robot@huawei.com> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20200117075547.60864-2-pannengyuan@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/scsi/virtio-scsi.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 4bc73a3..858b3aa 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -943,7 +943,13 @@ void virtio_scsi_common_unrealize(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
+ int i;
+ virtio_del_queue(vdev, 0);
+ virtio_del_queue(vdev, 1);
+ for (i = 0; i < vs->conf.num_queues; i++) {
+ virtio_del_queue(vdev, i + 2);
+ }
g_free(vs->cmd_vqs);
virtio_cleanup(vdev);
}