mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-17 23:22:12 -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
|
@ -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;
|
||||
|
|
|
@ -99,7 +99,7 @@ static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind,
|
|||
}
|
||||
|
||||
if (obj) {
|
||||
*obj = qemu_mallocz(size);
|
||||
*obj = g_malloc0(size);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -135,11 +135,11 @@ static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
entry = qemu_mallocz(sizeof(*entry));
|
||||
entry = g_malloc0(sizeof(*entry));
|
||||
if (*list) {
|
||||
so->entry = qlist_next(so->entry);
|
||||
if (so->entry == NULL) {
|
||||
qemu_free(entry);
|
||||
g_free(entry);
|
||||
return NULL;
|
||||
}
|
||||
(*list)->next = entry;
|
||||
|
@ -199,7 +199,7 @@ static void qmp_input_type_str(Visitor *v, char **obj, const char *name,
|
|||
return;
|
||||
}
|
||||
|
||||
*obj = qemu_strdup(qstring_get_str(qobject_to_qstring(qobj)));
|
||||
*obj = g_strdup(qstring_get_str(qobject_to_qstring(qobj)));
|
||||
}
|
||||
|
||||
static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
|
||||
|
@ -272,14 +272,14 @@ Visitor *qmp_input_get_visitor(QmpInputVisitor *v)
|
|||
void qmp_input_visitor_cleanup(QmpInputVisitor *v)
|
||||
{
|
||||
qobject_decref(v->obj);
|
||||
qemu_free(v);
|
||||
g_free(v);
|
||||
}
|
||||
|
||||
QmpInputVisitor *qmp_input_visitor_new(QObject *obj)
|
||||
{
|
||||
QmpInputVisitor *v;
|
||||
|
||||
v = qemu_mallocz(sizeof(*v));
|
||||
v = g_malloc0(sizeof(*v));
|
||||
|
||||
v->visitor.start_struct = qmp_input_start_struct;
|
||||
v->visitor.end_struct = qmp_input_end_struct;
|
||||
|
|
|
@ -42,7 +42,7 @@ static QmpOutputVisitor *to_qov(Visitor *v)
|
|||
|
||||
static void qmp_output_push_obj(QmpOutputVisitor *qov, QObject *value)
|
||||
{
|
||||
QStackEntry *e = qemu_mallocz(sizeof(*e));
|
||||
QStackEntry *e = g_malloc0(sizeof(*e));
|
||||
|
||||
e->value = value;
|
||||
QTAILQ_INSERT_HEAD(&qov->stack, e, node);
|
||||
|
@ -54,7 +54,7 @@ static QObject *qmp_output_pop(QmpOutputVisitor *qov)
|
|||
QObject *value;
|
||||
QTAILQ_REMOVE(&qov->stack, e, node);
|
||||
value = e->value;
|
||||
qemu_free(e);
|
||||
g_free(e);
|
||||
return value;
|
||||
}
|
||||
|
||||
|
@ -210,17 +210,17 @@ void qmp_output_visitor_cleanup(QmpOutputVisitor *v)
|
|||
if (e->value) {
|
||||
qobject_decref(e->value);
|
||||
}
|
||||
qemu_free(e);
|
||||
g_free(e);
|
||||
}
|
||||
|
||||
qemu_free(v);
|
||||
g_free(v);
|
||||
}
|
||||
|
||||
QmpOutputVisitor *qmp_output_visitor_new(void)
|
||||
{
|
||||
QmpOutputVisitor *v;
|
||||
|
||||
v = qemu_mallocz(sizeof(*v));
|
||||
v = g_malloc0(sizeof(*v));
|
||||
|
||||
v->visitor.start_struct = qmp_output_start_struct;
|
||||
v->visitor.end_struct = qmp_output_end_struct;
|
||||
|
|
|
@ -19,7 +19,7 @@ static QTAILQ_HEAD(, QmpCommand) qmp_commands =
|
|||
|
||||
void qmp_register_command(const char *name, QmpCommandFunc *fn)
|
||||
{
|
||||
QmpCommand *cmd = qemu_mallocz(sizeof(*cmd));
|
||||
QmpCommand *cmd = g_malloc0(sizeof(*cmd));
|
||||
|
||||
cmd->name = name;
|
||||
cmd->type = QCT_NORMAL;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue