From patchwork Sun Jan 24 21:23:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 43606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5CC66B7CA0 for ; Mon, 25 Jan 2010 08:31:13 +1100 (EST) Received: from localhost ([127.0.0.1]:43585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZA12-0001Im-JW for incoming@patchwork.ozlabs.org; Sun, 24 Jan 2010 16:29:04 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZ9wF-0008J6-1R for qemu-devel@nongnu.org; Sun, 24 Jan 2010 16:24:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZ9wA-0008H1-Dg for qemu-devel@nongnu.org; Sun, 24 Jan 2010 16:24:06 -0500 Received: from [199.232.76.173] (port=57338 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZ9wA-0008Gw-7E for qemu-devel@nongnu.org; Sun, 24 Jan 2010 16:24:02 -0500 Received: from smtp3-g21.free.fr ([212.27.42.3]:35519) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NZ9w9-0003Di-Mr for qemu-devel@nongnu.org; Sun, 24 Jan 2010 16:24:02 -0500 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id A10EC8181B5; Sun, 24 Jan 2010 22:23:57 +0100 (CET) Received: from localhost.localdomain (rob92-10-88-171-126-33.fbx.proxad.net [88.171.126.33]) by smtp3-g21.free.fr (Postfix) with ESMTP id A982C8180DE; Sun, 24 Jan 2010 22:23:54 +0100 (CET) From: Herve Poussineau To: qemu-devel@nongnu.org Date: Sun, 24 Jan 2010 21:23:56 +0000 Message-Id: <1264368236-3024-1-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.6.0.2.GIT X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Herve Poussineau Subject: [Qemu-devel] [PATCH] win32: pair qemu_memalign() with qemu_vfree() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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);