aboutsummaryrefslogtreecommitdiff
path: root/slirp.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-08-20 22:09:37 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-20 23:01:08 -0500
commitaaca322aba8518f3825506f48def7db30fd800d4 (patch)
tree7f3a91f53eb4ea4b148af6210b81aa22ffc7339a /slirp.c
parent14bf0c9f507611699d94c0e94ba7c4ecd834590b (diff)
downloadslirp-aaca322aba8518f3825506f48def7db30fd800d4.zip
slirp-aaca322aba8518f3825506f48def7db30fd800d4.tar.gz
slirp-aaca322aba8518f3825506f48def7db30fd800d4.tar.bz2
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>
Diffstat (limited to 'slirp.c')
-rw-r--r--slirp.c12
1 files changed, 6 insertions, 6 deletions
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) \