From 7267c0947d7e8ae5dff7bafd932c3bc285f43e5c Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Sat, 20 Aug 2011 22:09:37 -0500 Subject: Use glib memory allocation and free functions qemu_malloc/qemu_free no longer exist after this commit. Signed-off-by: Anthony Liguori --- qapi/qapi-dealloc-visitor.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'qapi/qapi-dealloc-visitor.c') diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index 8cde4dd0d4..f6290611fe 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -35,7 +35,7 @@ static QapiDeallocVisitor *to_qov(Visitor *v) static void qapi_dealloc_push(QapiDeallocVisitor *qov, void *value) { - StackEntry *e = qemu_mallocz(sizeof(*e)); + StackEntry *e = g_malloc0(sizeof(*e)); e->value = value; QTAILQ_INSERT_HEAD(&qov->stack, e, node); @@ -47,7 +47,7 @@ static void *qapi_dealloc_pop(QapiDeallocVisitor *qov) QObject *value; QTAILQ_REMOVE(&qov->stack, e, node); value = e->value; - qemu_free(e); + g_free(e); return value; } @@ -64,7 +64,7 @@ static void qapi_dealloc_end_struct(Visitor *v, Error **errp) QapiDeallocVisitor *qov = to_qov(v); void **obj = qapi_dealloc_pop(qov); if (obj) { - qemu_free(*obj); + g_free(*obj); } } @@ -76,7 +76,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **list, Error **errp) { GenericList *retval = *list; - qemu_free(retval->value); + g_free(retval->value); *list = retval->next; return retval; } @@ -89,7 +89,7 @@ static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, Error **errp) { if (obj) { - qemu_free(*obj); + g_free(*obj); } } @@ -121,14 +121,14 @@ Visitor *qapi_dealloc_get_visitor(QapiDeallocVisitor *v) void qapi_dealloc_visitor_cleanup(QapiDeallocVisitor *v) { - qemu_free(v); + g_free(v); } QapiDeallocVisitor *qapi_dealloc_visitor_new(void) { QapiDeallocVisitor *v; - v = qemu_mallocz(sizeof(*v)); + v = g_malloc0(sizeof(*v)); v->visitor.start_struct = qapi_dealloc_start_struct; v->visitor.end_struct = qapi_dealloc_end_struct; -- cgit v1.2.1