[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/14] virtio-scsi-dataplane: fix memory leak for Vir
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 14/14] virtio-scsi-dataplane: fix memory leak for VirtIOSCSIVring |
Date: |
Thu, 26 Mar 2015 17:02:34 +0100 |
From: Ting Wang <address@hidden>
VirtIOSCSIVring which allocated in virtio_scsi_vring_init
should be free when dataplane has been stopped or failed to start.
Signed-off-by: Ting Wang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/virtio-scsi-dataplane.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/scsi/virtio-scsi-dataplane.c b/hw/scsi/virtio-scsi-dataplane.c
index c069cd7..5575648 100644
--- a/hw/scsi/virtio-scsi-dataplane.c
+++ b/hw/scsi/virtio-scsi-dataplane.c
@@ -182,13 +182,19 @@ static void virtio_scsi_vring_teardown(VirtIOSCSI *s)
if (s->ctrl_vring) {
vring_teardown(&s->ctrl_vring->vring, vdev, 0);
+ g_slice_free(VirtIOSCSIVring, s->ctrl_vring);
+ s->ctrl_vring = NULL;
}
if (s->event_vring) {
vring_teardown(&s->event_vring->vring, vdev, 1);
+ g_slice_free(VirtIOSCSIVring, s->event_vring);
+ s->event_vring = NULL;
}
if (s->cmd_vrings) {
for (i = 0; i < vs->conf.num_queues && s->cmd_vrings[i]; i++) {
vring_teardown(&s->cmd_vrings[i]->vring, vdev, 2 + i);
+ g_slice_free(VirtIOSCSIVring, s->cmd_vrings[i]);
+ s->cmd_vrings[i] = NULL;
}
free(s->cmd_vrings);
s->cmd_vrings = NULL;
--
2.3.3
- [Qemu-devel] [PULL 02/14] fw_cfg: factor out initialization of FW_CFG_ID (rev. number), (continued)
- [Qemu-devel] [PULL 02/14] fw_cfg: factor out initialization of FW_CFG_ID (rev. number), Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 07/14] vmw_pvscsi: use PCI DMA APIs, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 08/14] nbd: Fix up comment after commit e140177, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 06/14] megasas: use PCI DMA APIs, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 03/14] i6300esb: Correct endiannness, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 13/14] misc: fix typos in copyright declaration, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 12/14] exec: avoid possible overwriting of mmaped area in qemu_ram_remap, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 09/14] m68k: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 10/14] mips: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 11/14] sparc: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory, Paolo Bonzini, 2015/03/26
- [Qemu-devel] [PULL 14/14] virtio-scsi-dataplane: fix memory leak for VirtIOSCSIVring,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL 00/14] Misc bugfixes for 2.3.0-rc2, Peter Maydell, 2015/03/26