Use glib memory allocation and free functions

qemu_malloc/qemu_free no longer exist after this commit.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/misc.c b/misc.c
index a24d2cb..15e118c 100644
--- a/misc.c
+++ b/misc.c
@@ -175,7 +175,7 @@ int fork_exec(struct socket *so, const char *ex, int do_pty)
             close(s);
 
         i = 0;
-        bptr = qemu_strdup(ex); /* No need to free() this */
+        bptr = g_strdup(ex); /* No need to free() this */
         if (do_pty == 1) {
             /* Setup "slirp.telnetd -x" */
             argv[i++] = "slirp.telnetd";
diff --git a/slirp.c b/slirp.c
index 9779666..a675231 100644
--- a/slirp.c
+++ b/slirp.c
@@ -201,7 +201,7 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork,
                   const char *bootfile, struct in_addr vdhcp_start,
                   struct in_addr vnameserver, void *opaque)
 {
-    Slirp *slirp = qemu_mallocz(sizeof(Slirp));
+    Slirp *slirp = g_malloc0(sizeof(Slirp));
 
     slirp_init_once();
 
@@ -221,10 +221,10 @@ Slirp *slirp_init(int restricted, struct in_addr vnetwork,
                 vhostname);
     }
     if (tftp_path) {
-        slirp->tftp_prefix = qemu_strdup(tftp_path);
+        slirp->tftp_prefix = g_strdup(tftp_path);
     }
     if (bootfile) {
-        slirp->bootp_filename = qemu_strdup(bootfile);
+        slirp->bootp_filename = g_strdup(bootfile);
     }
     slirp->vdhcp_startaddr = vdhcp_start;
     slirp->vnameserver_addr = vnameserver;
@@ -245,9 +245,9 @@ void slirp_cleanup(Slirp *slirp)
 
     unregister_savevm(NULL, "slirp", slirp);
 
-    qemu_free(slirp->tftp_prefix);
-    qemu_free(slirp->bootp_filename);
-    qemu_free(slirp);
+    g_free(slirp->tftp_prefix);
+    g_free(slirp->bootp_filename);
+    g_free(slirp);
 }
 
 #define CONN_CANFSEND(so) \
diff --git a/tftp.c b/tftp.c
index 0e54105..0a9bba6 100644
--- a/tftp.c
+++ b/tftp.c
@@ -37,7 +37,7 @@ static inline void tftp_session_update(struct tftp_session *spt)
 
 static void tftp_session_terminate(struct tftp_session *spt)
 {
-    qemu_free(spt->filename);
+    g_free(spt->filename);
     spt->slirp = NULL;
 }
 
@@ -54,7 +54,7 @@ static int tftp_session_allocate(Slirp *slirp, struct tftp_t *tp)
 
         /* sessions time out after 5 inactive seconds */
         if ((int)(curtime - spt->timestamp) > 5000) {
-            qemu_free(spt->filename);
+            g_free(spt->filename);
             goto found;
         }
     }
@@ -282,7 +282,7 @@ static void tftp_handle_rrq(Slirp *slirp, struct tftp_t *tp, int pktlen)
 
     /* prepend tftp_prefix */
     prefix_len = strlen(slirp->tftp_prefix);
-    spt->filename = qemu_malloc(prefix_len + TFTP_FILENAME_MAX + 2);
+    spt->filename = g_malloc(prefix_len + TFTP_FILENAME_MAX + 2);
     memcpy(spt->filename, slirp->tftp_prefix, prefix_len);
     spt->filename[prefix_len] = '/';