[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] win32: pair qemu_memalign() with qemu_vfree()
From: |
Herve Poussineau |
Subject: |
[Qemu-devel] [PATCH] win32: pair qemu_memalign() with qemu_vfree() |
Date: |
Sun, 24 Jan 2010 21:23:56 +0000 |
Win32 suffers from a very big memory leak when dealing with SCSI devices.
Each read/write request allocates memory with qemu_memalign (ie
VirtualAlloc) but frees it with qemu_free (ie free).
Pair all qemu_memalign() calls with qemu_vfree() to prevent such leaks.
Signed-off-by: Herve Poussineau <address@hidden>
---
block.c | 2 +-
block/raw-posix.c | 2 +-
exec.c | 2 +-
hw/scsi-disk.c | 2 +-
qemu-nbd.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block.c b/block.c
index 73c26ec..6e440b7 100644
--- a/block.c
+++ b/block.c
@@ -1629,7 +1629,7 @@ static void multiwrite_user_cb(MultiwriteCB *mcb)
for (i = 0; i < mcb->num_callbacks; i++) {
mcb->callbacks[i].cb(mcb->callbacks[i].opaque, mcb->error);
qemu_free(mcb->callbacks[i].free_qiov);
- qemu_free(mcb->callbacks[i].free_buf);
+ qemu_vfree(mcb->callbacks[i].free_buf);
}
}
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 52bbcda..b4ff841 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -595,7 +595,7 @@ static void raw_close(BlockDriverState *bs)
close(s->fd);
s->fd = -1;
if (s->aligned_buf != NULL)
- qemu_free(s->aligned_buf);
+ qemu_vfree(s->aligned_buf);
}
}
diff --git a/exec.c b/exec.c
index 1190591..76831a1 100644
--- a/exec.c
+++ b/exec.c
@@ -3309,7 +3309,7 @@ void cpu_physical_memory_unmap(void *buffer,
target_phys_addr_t len,
if (is_write) {
cpu_physical_memory_write(bounce.addr, bounce.buffer, access_len);
}
- qemu_free(bounce.buffer);
+ qemu_vfree(bounce.buffer);
bounce.buffer = NULL;
cpu_notify_map_clients();
}
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index e3924de..b34fbaa 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -81,7 +81,7 @@ static SCSIDiskReq *scsi_new_request(SCSIDevice *d, uint32_t
tag, uint32_t lun)
static void scsi_remove_request(SCSIDiskReq *r)
{
- qemu_free(r->iov.iov_base);
+ qemu_vfree(r->iov.iov_base);
scsi_req_free(&r->req);
}
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4463679..eac0c21 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -469,7 +469,7 @@ int main(int argc, char **argv)
}
}
} while (persistent || nb_fds > 1);
- qemu_free(data);
+ qemu_vfree(data);
close(sharing_fds[0]);
bdrv_close(bs);
--
1.6.0.2.GIT
- [Qemu-devel] [PATCH] win32: pair qemu_memalign() with qemu_vfree(),
Herve Poussineau <=