mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00
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>
This commit is contained in:
parent
14015304b6
commit
7267c0947d
357 changed files with 1672 additions and 1674 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue