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

Author: digit-android

Makefile.common

@@ -429,7 +429,6 @@ CORE_MISC_SOURCES = \
     iohandler.c \
     ioport.c \
     qemu-char.c \
-    qemu-malloc.c \
     readline.c \
     savevm.c \
     android/boot-properties.c \

aio-android.c

@@ -76,13 +76,13 @@ int qemu_aio_set_fd_handler(int fd,
                  * releasing the walking_handlers lock.
                  */
                 QLIST_REMOVE(node, node);
-                qemu_free(node);
+                g_free(node);
             }
         }
     } else {
         if (node == NULL) {
             /* Alloc and insert if it's not already there */
-            node = qemu_mallocz(sizeof(AioHandler));
+            node = g_malloc0(sizeof(AioHandler));
             node->fd = fd;
             QLIST_INSERT_HEAD(&aio_handlers, node, node);
         }
@@ -217,7 +217,7 @@ void qemu_aio_wait(void)
 
                 if (tmp->deleted) {
                     QLIST_REMOVE(tmp, node);
-                    qemu_free(tmp);
+                    g_free(tmp);
                 }
             }
 

aio.c

@@ -75,13 +75,13 @@ int qemu_aio_set_fd_handler(int fd,
                  * releasing the walking_handlers lock.
                  */
                 QLIST_REMOVE(node, node);
-                qemu_free(node);
+                g_free(node);
             }
         }
     } else {
         if (node == NULL) {
             /* Alloc and insert if it's not already there */
-            node = qemu_mallocz(sizeof(AioHandler));
+            node = g_malloc0(sizeof(AioHandler));
             node->fd = fd;
             QLIST_INSERT_HEAD(&aio_handlers, node, node);
         }
@@ -220,7 +220,7 @@ void qemu_aio_wait(void)
 
                 if (tmp->deleted) {
                     QLIST_REMOVE(tmp, node);
-                    qemu_free(tmp);
+                    g_free(tmp);
                 }
             }
 

android/looper-qemu.c

@@ -140,7 +140,7 @@ static void qlooper_delIo(QLooper*  looper, QLoopIo* io);
 static QLoopIo*
 qloopio_new(int fd, LoopIoFunc callback, void* opaque, QLooper* qlooper)
 {
-    QLoopIo*  io = qemu_malloc(sizeof(*io));
+    QLoopIo*  io = g_malloc(sizeof(*io));
 
     io->fd = fd;
     io->user_callback = callback;
@@ -251,7 +251,7 @@ qloopio_free(void* impl)
     /* make QEMU forget about this fd */
     qemu_set_fd_handler(io->fd, NULL, NULL, NULL);
     io->fd = -1;
-    qemu_free(io);
+    g_free(io);
 }
 
 static unsigned
@@ -400,13 +400,13 @@ qlooper_destroy(Looper* ll)
         qloopio_free(io);
 
     qemu_bh_delete(looper->io_bh);
-    qemu_free(looper);
+    g_free(looper);
 }
 
 Looper*
 looper_newCore(void)
 {
-    QLooper*  looper = qemu_mallocz(sizeof(*looper));
+    QLooper*  looper = g_malloc0(sizeof(*looper));
 
     looper->io_list    = NULL;
     looper->io_pending = NULL;

android/protocol/core-commands-impl.c

@@ -89,7 +89,7 @@ _alloc_cmd_param_buf(CoreCmdImpl* corecmd, uint32_t size)
         corecmd->cmd_param_buf = &corecmd->cmd_param[0];
     } else {
         // Expected request us too large to fit into preallocated buffer.
-        corecmd->cmd_param_buf = qemu_malloc(size);
+        corecmd->cmd_param_buf = g_malloc(size);
     }
     return corecmd->cmd_param_buf;
 }
@@ -100,7 +100,7 @@ static void
 _free_cmd_param_buf(CoreCmdImpl* corecmd)
 {
     if (corecmd->cmd_param_buf != &corecmd->cmd_param[0]) {
-        qemu_free(corecmd->cmd_param_buf);
+        g_free(corecmd->cmd_param_buf);
         corecmd->cmd_param_buf = &corecmd->cmd_param[0];
     }
 }
@@ -227,7 +227,7 @@ _coreCmdImpl_handle_command(CoreCmdImpl* corecmd,
                 }
                 // Allocate and initialize response data buffer.
                 resp_data =
-                    (UICmdGetNetSpeedResp*)qemu_malloc(resp.resp_data_size);
+                    (UICmdGetNetSpeedResp*)g_malloc(resp.resp_data_size);
                 resp_data->upload = netspeed->upload;
                 resp_data->download = netspeed->download;
                 strcpy(resp_data->name, netspeed->name);
@@ -240,7 +240,7 @@ _coreCmdImpl_handle_command(CoreCmdImpl* corecmd,
             }
             _coreCmdImpl_respond(corecmd, &resp, resp_data);
             if (resp_data != NULL) {
-                qemu_free(resp_data);
+                g_free(resp_data);
             }
             break;
         }
@@ -271,7 +271,7 @@ _coreCmdImpl_handle_command(CoreCmdImpl* corecmd,
                 }
                 // Allocate and initialize response data buffer.
                 resp_data =
-                    (UICmdGetNetDelayResp*)qemu_malloc(resp.resp_data_size);
+                    (UICmdGetNetDelayResp*)g_malloc(resp.resp_data_size);
                 resp_data->min_ms = netdelay->min_ms;
                 resp_data->max_ms = netdelay->max_ms;
                 strcpy(resp_data->name, netdelay->name);
@@ -284,7 +284,7 @@ _coreCmdImpl_handle_command(CoreCmdImpl* corecmd,
             }
             _coreCmdImpl_respond(corecmd, &resp, resp_data);
             if (resp_data != NULL) {
-                qemu_free(resp_data);
+                g_free(resp_data);
             }
             break;
         }
@@ -303,7 +303,7 @@ _coreCmdImpl_handle_command(CoreCmdImpl* corecmd,
             }
             _coreCmdImpl_respond(corecmd, &resp, filepath);
             if (filepath != NULL) {
-                qemu_free(filepath);
+                g_free(filepath);
             }
             break;
         }

android/protocol/core-commands-qemu.c

@@ -97,7 +97,7 @@ corecmd_get_qemu_path(int type,
     }
     strncpy(path, filepath, path_buf_size);
     path[path_buf_size - 1] = '\0';
-    qemu_free(filepath);
+    g_free(filepath);
     return 0;
 }
 

android/protocol/ui-commands-proxy.c

@@ -149,12 +149,12 @@ _uiCmdProxy_brightness_change_callback(void* opaque,
     const size_t cmd_size = sizeof(UICmdChangeDispBrightness) + strlen(light) + 1;
     // Allocate and initialize parameters.
     UICmdChangeDispBrightness* cmd =
-        (UICmdChangeDispBrightness*)qemu_malloc(cmd_size);
+        (UICmdChangeDispBrightness*)g_malloc(cmd_size);
     cmd->brightness = brightness;
     strcpy(cmd->light, light);
     // Send the command.
     _uiCmdProxy_send_command(AUICMD_CHANGE_DISP_BRIGHTNESS, cmd, cmd_size);
-    qemu_free(cmd);
+    g_free(cmd);
 }
 
 int

android/shaper.c

@@ -72,7 +72,7 @@ queued_packet_create( const void*   data,
     if (do_copy)
         packet_size += size;
 
-    packet = qemu_malloc(packet_size);
+    packet = g_malloc(packet_size);
     packet->next       = NULL;
     packet->expiration = 0;
     packet->size       = (size_t)size;
@@ -91,7 +91,7 @@ static void
 queued_packet_free( QueuedPacket  packet )
 {
     if (packet) {
-        qemu_free( packet );
+        g_free( packet );
     }
 }
 
@@ -126,7 +126,7 @@ netshaper_destroy( NetShaper  shaper )
         qemu_del_timer(shaper->timer);
         qemu_free_timer(shaper->timer);
         shaper->timer = NULL;
-        qemu_free(shaper);
+        g_free(shaper);
     }
 }
 
@@ -162,7 +162,7 @@ NetShaper
 netshaper_create( int                do_copy,
                   NetShaperSendFunc  send_func )
 {
-    NetShaper  shaper = qemu_malloc(sizeof(*shaper));
+    NetShaper  shaper = g_malloc(sizeof(*shaper));
 
     shaper->active = 0;
     shaper->packets = NULL;
@@ -188,7 +188,7 @@ netshaper_set_rate( NetShaper  shaper,
         QueuedPacket  packet = shaper->packets;
         shaper->packets = packet->next;
         shaper->send_func(packet->data, packet->size, packet->opaque);
-        qemu_free(packet);
+        g_free(packet);
         shaper->num_packets = 0;
     }
 
@@ -311,7 +311,7 @@ session_free( Session  session )
             queued_packet_free(session->packet);
             session->packet = NULL;
         }
-        qemu_free( session );
+        g_free( session );
     }
 }
 
@@ -459,7 +459,7 @@ netdelay_expires( NetDelay  delay )
 NetDelay
 netdelay_create( NetShaperSendFunc  send_func )
 {
-    NetDelay  delay = qemu_malloc(sizeof(*delay));
+    NetDelay  delay = g_malloc(sizeof(*delay));
 
     delay->sessions     = NULL;
     delay->num_sessions = 0;
@@ -547,7 +547,7 @@ netdelay_send_aux( NetDelay  delay, const void*  data, size_t  size, void* opaqu
                     latency += rand() % range;
 
                     //fprintf(stderr, "NetDelay:RST: delay creation for %s\n", session_to_string(info) );
-                session = qemu_malloc( sizeof(*session) );
+                session = g_malloc( sizeof(*session) );
 
                 session->next        = delay->sessions;
                 delay->sessions      = session;
@@ -584,7 +584,7 @@ netdelay_destroy( NetDelay  delay )
             delay->num_sessions -= 1;
         }
         delay->active = 0;
-        qemu_free( delay );
+        g_free( delay );
     }
 }
 

arch_init.c

@@ -236,7 +236,7 @@ static void sort_ram_list(void)
     QLIST_FOREACH(block, &ram_list.blocks, next) {
         ++n;
     }
-    blocks = qemu_malloc(n * sizeof *blocks);
+    blocks = g_malloc(n * sizeof *blocks);
     n = 0;
     QLIST_FOREACH_SAFE(block, &ram_list.blocks, next, nblock) {
         blocks[n++] = block;
@@ -246,7 +246,7 @@ static void sort_ram_list(void)
     while (--n >= 0) {
         QLIST_INSERT_HEAD(&ram_list.blocks, blocks[n], next);
     }
-    qemu_free(blocks);
+    g_free(blocks);
 }
 
 int ram_save_live(QEMUFile *f, int stage, void *opaque)

async.c

@@ -64,7 +64,7 @@ static struct AsyncContext *async_context = &(struct AsyncContext) { 0 };
  */
 void async_context_push(void)
 {
-    struct AsyncContext *new = qemu_mallocz(sizeof(*new));
+    struct AsyncContext *new = g_malloc0(sizeof(*new));
     new->parent = async_context;
     new->id = async_context->id + 1;
     async_context = new;
@@ -75,7 +75,7 @@ static void bh_run_aio_completions(void *opaque)
 {
     QEMUBH **bh = opaque;
     qemu_bh_delete(*bh);
-    qemu_free(bh);
+    g_free(bh);
     qemu_aio_process_queue();
 }
 /*
@@ -92,14 +92,14 @@ void async_context_pop(void)
 
     /* Switch back to the parent context */
     async_context = async_context->parent;
-    qemu_free(old);
+    g_free(old);
 
     if (async_context == NULL) {
         abort();
     }
 
     /* Schedule BH to run any queued AIO completions as soon as possible */
-    bh = qemu_malloc(sizeof(*bh));
+    bh = g_malloc(sizeof(*bh));
     *bh = qemu_bh_new(bh_run_aio_completions, bh);
     qemu_bh_schedule(*bh);
 }
@@ -127,7 +127,7 @@ struct QEMUBH {
 QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
 {
     QEMUBH *bh;
-    bh = qemu_mallocz(sizeof(QEMUBH));
+    bh = g_malloc0(sizeof(QEMUBH));
     bh->cb = cb;
     bh->opaque = opaque;
     bh->next = async_context->first_bh;
@@ -157,7 +157,7 @@ int qemu_bh_poll(void)
         bh = *bhp;
         if (bh->deleted) {
             *bhp = bh->next;
-            qemu_free(bh);
+            g_free(bh);
         } else
             bhp = &bh->next;
     }

audio/alsaaudio.c

@@ -208,7 +208,7 @@ static void alsa_fini_poll (struct pollhlp *hlp)
         for (i = 0; i < hlp->count; ++i) {
             qemu_set_fd_handler (pfds[i].fd, NULL, NULL, NULL);
         }
-        qemu_free (pfds);
+        g_free (pfds);
     }
     hlp->pfds = NULL;
     hlp->count = 0;
@@ -332,7 +332,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
     if (err < 0) {
         alsa_logerr (err, "Could not initialize poll mode\n"
                      "Could not obtain poll descriptors\n");
-        qemu_free (pfds);
+        g_free (pfds);
         return -1;
     }
 
@@ -360,7 +360,7 @@ static int alsa_poll_helper (snd_pcm_t *handle, struct pollhlp *hlp, int mask)
             while (i--) {
                 qemu_set_fd_handler (pfds[i].fd, NULL, NULL, NULL);
             }
-            qemu_free (pfds);
+            g_free (pfds);
             return -1;
         }
     }
@@ -869,7 +869,7 @@ static void alsa_fini_out (HWVoiceOut *hw)
     alsa_anal_close (&alsa->handle, &alsa->pollhlp);
 
     if (alsa->pcm_buf) {
-        qemu_free (alsa->pcm_buf);
+        g_free (alsa->pcm_buf);
         alsa->pcm_buf = NULL;
     }
 }
@@ -1039,7 +1039,7 @@ static void alsa_fini_in (HWVoiceIn *hw)
     alsa_anal_close (&alsa->handle, &alsa->pollhlp);
 
     if (alsa->pcm_buf) {
-        qemu_free (alsa->pcm_buf);
+        g_free (alsa->pcm_buf);
         alsa->pcm_buf = NULL;
     }
 }