diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 22:09:37 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-20 23:01:08 -0500 |
| commit | 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c (patch) | |
| tree | 9aa05d6e05ed83e67bf014f6745a3081b8407dc5 /iohandler.c | |
| parent | 14015304b662e8f8ccce46c5a6927af6a14c510b (diff) | |
| download | qemu-7267c0947d7e8ae5dff7bafd932c3bc285f43e5c.tar.gz | |
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 'iohandler.c')
| -rw-r--r-- | iohandler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/iohandler.c b/iohandler.c index 2b824218e5..4deae1e6ab 100644 --- a/iohandler.c +++ b/iohandler.c @@ -67,7 +67,7 @@ int qemu_set_fd_handler2(int fd, if (ioh->fd == fd) goto found; } - ioh = qemu_mallocz(sizeof(IOHandlerRecord)); + ioh = g_malloc0(sizeof(IOHandlerRecord)); QLIST_INSERT_HEAD(&io_handlers, ioh, next); found: ioh->fd = fd; @@ -126,7 +126,7 @@ void qemu_iohandler_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds, int re /* Do this last in case read/write handlers marked it for deletion */ if (ioh->deleted) { QLIST_REMOVE(ioh, next); - qemu_free(ioh); + g_free(ioh); } } } @@ -157,7 +157,7 @@ static void sigchld_bh_handler(void *opaque) QLIST_FOREACH_SAFE(rec, &child_watches, next, next) { if (waitpid(rec->pid, NULL, WNOHANG) == rec->pid) { QLIST_REMOVE(rec, next); - qemu_free(rec); + g_free(rec); } } } @@ -185,7 +185,7 @@ int qemu_add_child_watch(pid_t pid) return 1; } } - rec = qemu_mallocz(sizeof(ChildProcessRecord)); + rec = g_malloc0(sizeof(ChildProcessRecord)); rec->pid = pid; QLIST_INSERT_HEAD(&child_watches, rec, next); return 0; |