win32: pair qemu_memalign() with qemu_vfree()

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 <hpoussin@reactos.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/block.c b/block.c
index 5f29020152691ea35607246d2ea2b21aeb2f23ab..9c106a8e4dc3d4a93011aeea2a5fe1decb74298a 100644 (file)
--- a/block.c
+++ b/block.c
@@ -1631,7 +1631,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 325d2265f5c4d470cb9c0ce7bf652e6ea9b2be93..96f26173ef8bf321f2df9ded97e8ae4ea4855ef6 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -591,7 +591,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 1190591e936f488d2b2e3573c2be99f07854886d..76831a194f495ece22a928cf9fe06a3b1906bf24 100644 (file)
--- 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 e3924dec9da33d44d21eee17fb1b9dc5803742f9..b34fbaa6746d66cce1526e88d67dadd9ed20712d 100644 (file)
--- 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 4463679758ba7a92154d6d3fe77af0fe25a36b4a..eac0c21f1c9278cddf2045930e6b36335c1d85b4 100644 (file)
--- 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);