[Qemu-devel] [PATCH 1/8] Fix qemu_free use in acpi.c

[Qemu-devel] [PATCH 1/8] Fix qemu_free use in acpi.c

[Jean-Christophe DUBOIS]

acpi.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/acpi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/acpi.c b/hw/acpi.c
index dcc2c86..9a69e7d 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -920,7 +920,7 @@ int acpi_table_add(const char *t)
     return 0;
 out:
     if (acpi_tables) {
-        free(acpi_tables);
+        qemu_free(acpi_tables);
         acpi_tables = NULL;
     }
     return -1;
-- 
1.6.3.3

[Qemu-devel] [PATCH 2/8] Fix qemu_free use in baum.c

[Jean-Christophe DUBOIS]

baum.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/baum.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/baum.c b/hw/baum.c
index 8a12985..10c4302 100644
--- a/hw/baum.c
+++ b/hw/baum.c
@@ -559,7 +559,7 @@ static void baum_chr_read(void *opaque)
     if (ret == -1 && (brlapi_errno != BRLAPI_ERROR_LIBCERR || errno != EINTR)) {
         brlapi_perror("baum: brlapi_readKey");
         brlapi__closeConnection(baum->brlapi);
-        free(baum->brlapi);
+        qemu_free(baum->brlapi);
         baum->brlapi = NULL;
     }
 }
@@ -622,8 +622,8 @@ fail:
     qemu_free_timer(baum->cellCount_timer);
     brlapi__closeConnection(handle);
 fail_handle:
-    free(handle);
-    free(chr);
-    free(baum);
+    qemu_free(handle);
+    qemu_free(chr);
+    qemu_free(baum);
     return NULL;
 }
-- 
1.6.3.3

[Qemu-devel] [PATCH 3/8] Fix qemu_free use in nand.c

[Jean-Christophe DUBOIS]

nand.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/nand.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/nand.c b/hw/nand.c
index 37fd524..838f8bc 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -507,9 +507,9 @@ void nand_done(NANDFlashState *s)
     }
 
     if (!s->bdrv || s->mem_oob)
-        free(s->storage);
+        qemu_free(s->storage);
 
-    free(s);
+    qemu_free(s);
 }
 
 #else
-- 
1.6.3.3

[Qemu-devel] [PATCH 4/8] Fix qemu_free use in bt-l2cap.c

[Jean-Christophe DUBOIS]

bt-l2cap.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/bt-l2cap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/bt-l2cap.c b/hw/bt-l2cap.c
index 4697f52..70d731e 100644
--- a/hw/bt-l2cap.c
+++ b/hw/bt-l2cap.c
@@ -1218,7 +1218,7 @@ static void l2cap_teardown(struct l2cap_instance_s *l2cap, int send_disconnect)
     for (cid = L2CAP_CID_ALLOC; cid < L2CAP_CID_MAX; cid ++)
         if (l2cap->cid[cid]) {
             l2cap->cid[cid]->params.close(l2cap->cid[cid]->params.opaque);
-            free(l2cap->cid[cid]);
+            qemu_free(l2cap->cid[cid]);
         }
 
     if (l2cap->role)
-- 
1.6.3.3

[Qemu-devel] [PATCH 5/8] Fix qemu_free use in nseries.c

[Jean-Christophe DUBOIS]

nseries.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/nseries.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/nseries.c b/hw/nseries.c
index 79f7387..0273eee 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -711,7 +711,7 @@ static void n800_dss_init(struct rfbi_chip_s *chip)
     fb_blank = memset(qemu_malloc(800 * 480 * 2), 0xff, 800 * 480 * 2);
     /* Display Memory Data Port */
     chip->block(chip->opaque, 1, fb_blank, 800 * 480 * 2, 800);
-    free(fb_blank);
+    qemu_free(fb_blank);
 }
 
 static void n8x0_dss_setup(struct n800_s *s)
-- 
1.6.3.3

[Qemu-devel] [PATCH 6/8] Fix qemu_free use in scsi-generic.c

[Jean-Christophe DUBOIS]

scsi-generic.c is using free() instead of qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/scsi-generic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 92ef771..cf56ea0 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -561,7 +561,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
 
     if (len == 0) {
         if (r->buf != NULL)
-            free(r->buf);
+            qemu_free(r->buf);
         r->buflen = 0;
         r->buf = NULL;
         ret = execute_command(s->dinfo->bdrv, r, SG_DXFER_NONE, scsi_command_complete);
@@ -574,7 +574,7 @@ static int32_t scsi_send_command(SCSIDevice *d, uint32_t tag,
 
     if (r->buflen != len) {
         if (r->buf != NULL)
-            free(r->buf);
+            qemu_free(r->buf);
         r->buf = qemu_malloc(len);
         r->buflen = len;
     }
-- 
1.6.3.3

[Qemu-devel] [PATCH 7/8] Fix free use in xen_backend.c

[Jean-Christophe DUBOIS]

xen_backend.c is using qemu_free() instead of free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/xen_backend.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xen_backend.c b/hw/xen_backend.c
index 658ea8d..a2e408f 100644
--- a/hw/xen_backend.c
+++ b/hw/xen_backend.c
@@ -594,7 +594,7 @@ static void xenstore_update(void *unused)
 	xenstore_update_fe(vec[XS_WATCH_PATH], (void*)ptr);
 
 cleanup:
-    qemu_free(vec);
+    free(vec);
 }
 
 static void xen_be_evtchn_event(void *opaque)
-- 
1.6.3.3

[Qemu-devel] [PATCH 8/8] Fix qemu_malloc/qemu_free use in rtl8139.c

[Jean-Christophe DUBOIS]

rtl8139.c is using malloc()/free() instead of qemu_malloc()/qemu_free().
Fix it.

Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
 hw/rtl8139.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/rtl8139.c b/hw/rtl8139.c
index c166db0..be47f61 100644
--- a/hw/rtl8139.c
+++ b/hw/rtl8139.c
@@ -1985,7 +1985,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
     if (!s->cplus_txbuffer)
     {
         s->cplus_txbuffer_len = CP_TX_BUFFER_SIZE;
-        s->cplus_txbuffer = malloc(s->cplus_txbuffer_len);
+        s->cplus_txbuffer = qemu_malloc(s->cplus_txbuffer_len);
         s->cplus_txbuffer_offset = 0;
 
         DEBUG_PRINT(("RTL8139: +++ C+ mode transmission buffer allocated space %d\n", s->cplus_txbuffer_len));
@@ -2300,7 +2300,7 @@ static int rtl8139_cplus_transmit_one(RTL8139State *s)
         }
         else
         {
-            free(saved_buffer);
+            qemu_free(saved_buffer);
         }
     }
     else
-- 
1.6.3.3