commit aa8236dc1b1ea300ab18716db5b8fab42aca3ca7
author David 'Digit' Turner <digit@android.com> Fri Jan 10 17:02:29 2014 +0100
committer David 'Digit' Turner <digit@android.com> Fri Jan 10 19:12:42 2014 +0100
tree 9fa8e2872087062d45c938a72645b6204b29fa58
parent 1d1a2af599bfd91357cbc44b3cf20b1ab104f4ab

qemu-malloc.c: Remove qemu-specific heap routines.

Remove all uses of qemu_malloc/malloc0/realloc/free/strdup/etc to use
the equivalent GLib functions (g_malloc, g_free, ...) as per upstream.

This also removes qemu-malloc.c since it's no longer required.

Change-Id: I3c36a0396b73dd114b8da385b43f56a2e54dbb15

savevm.c

diff --git a/savevm.c b/savevm.c
index c55f00a..a81b166 100644
--- a/savevm.c
+++ b/savevm.c
@@ -210,7 +210,7 @@
 static int file_socket_close(void *opaque)
 {
     QEMUFileSocket *s = opaque;
-    qemu_free(s);
+    g_free(s);
     return 0;
 }
 
@@ -238,7 +238,7 @@
     QEMUFileStdio *s = opaque;
     int ret;
     ret = pclose(s->stdio_file);
-    qemu_free(s);
+    g_free(s);
     return ret;
 }
 
@@ -246,7 +246,7 @@
 {
     QEMUFileStdio *s = opaque;
     fclose(s->stdio_file);
-    qemu_free(s);
+    g_free(s);
     return 0;
 }
 
@@ -259,7 +259,7 @@
         return NULL;
     }
 
-    s = qemu_mallocz(sizeof(QEMUFileStdio));
+    s = g_malloc0(sizeof(QEMUFileStdio));
 
     s->stdio_file = stdio_file;
 
@@ -307,7 +307,7 @@
         return NULL;
     }
 
-    s = qemu_mallocz(sizeof(QEMUFileStdio));
+    s = g_malloc0(sizeof(QEMUFileStdio));
     s->stdio_file = fdopen(fd, mode);
     if (!s->stdio_file)
         goto fail;
@@ -322,13 +322,13 @@
     return s->file;
 
 fail:
-    qemu_free(s);
+    g_free(s);
     return NULL;
 }
 
 QEMUFile *qemu_fopen_socket(int fd)
 {
-    QEMUFileSocket *s = qemu_mallocz(sizeof(QEMUFileSocket));
+    QEMUFileSocket *s = g_malloc0(sizeof(QEMUFileSocket));
 
     s->fd = fd;
     s->file = qemu_fopen_ops(s, NULL, socket_get_buffer, file_socket_close,
@@ -362,7 +362,7 @@
         return NULL;
     }
 
-    s = qemu_mallocz(sizeof(QEMUFileStdio));
+    s = g_malloc0(sizeof(QEMUFileStdio));
 
     s->stdio_file = fopen(filename, mode);
     if (!s->stdio_file)
@@ -377,7 +377,7 @@
     }
     return s->file;
 fail:
-    qemu_free(s);
+    g_free(s);
     return NULL;
 }
 
@@ -415,7 +415,7 @@
 {
     QEMUFile *f;
 
-    f = qemu_mallocz(sizeof(QEMUFile));
+    f = g_malloc0(sizeof(QEMUFile));
 
     f->opaque = opaque;
     f->put_buffer = put_buffer;
@@ -481,7 +481,7 @@
     qemu_fflush(f);
     if (f->close)
         ret = f->close(f->opaque);
-    qemu_free(f);
+    g_free(f);
     return ret;
 }
 
@@ -587,9 +587,9 @@
     if (slen == 0)
         return NULL;
 
-    str = qemu_malloc(slen+1);
+    str = g_malloc(slen+1);
     if (qemu_get_buffer(f, (uint8_t*)str, slen) != slen) {
-        qemu_free(str);
+        g_free(str);
         return NULL;
     }
     str[slen] = '\0';
@@ -836,7 +836,7 @@
     SaveStateEntry *se, **pse;
     static int global_section_id;
 
-    se = qemu_malloc(sizeof(SaveStateEntry));
+    se = g_malloc(sizeof(SaveStateEntry));
     pstrcpy(se->idstr, sizeof(se->idstr), idstr);
     se->instance_id = (instance_id == -1) ? 0 : instance_id;
     se->version_id = version_id;
@@ -879,7 +879,7 @@
     while (*pse != NULL) {
         if (strcmp((*pse)->idstr, idstr) == 0 && (*pse)->opaque == opaque) {
             SaveStateEntry *next = (*pse)->next;
-            qemu_free(*pse);
+            g_free(*pse);
             *pse = next;
             continue;
         }
@@ -1149,7 +1149,7 @@
             }
 
             /* Add entry */
-            le = qemu_mallocz(sizeof(*le));
+            le = g_malloc0(sizeof(*le));
 
             le->se = se;
             le->section_id = section_id;
@@ -1189,7 +1189,7 @@
     while (first_le) {
         LoadStateEntry *le = first_le;
         first_le = first_le->next;
-        qemu_free(le);
+        g_free(le);
     }
 
     if (qemu_file_has_error(f))
@@ -1234,7 +1234,7 @@
             break;
         }
     }
-    qemu_free(sn_tab);
+    g_free(sn_tab);
     return ret;
 }
 
@@ -1481,5 +1481,5 @@
         sn = &sn_tab[i];
         monitor_printf(out, "%s\n", bdrv_snapshot_dump(buf, sizeof(buf), sn));
     }
-    qemu_free(sn_tab);
+    g_free(sn_tab);
 }