ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qapi: dealloc visitor, support freeing of nested lists 

Previously our logic for keeping track of when we're visiting the head
of a list was done via a global bool. This can be overwritten if dealing
with nested lists, so use stack entries to track this instead.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Michael Roth 2011-09-19 19:03:10 -05:00 committed by Luiz Capitulino
parent 5cd5f0d059
commit 0b9d854230
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qapi/qapi-dealloc-visitor.c
View File

@ -19,6 +19,7 @@
typedef struct StackEntry typedef struct StackEntry
{ {
void *value; void *value;
bool is_list_head;
QTAILQ_ENTRY(StackEntry) node; QTAILQ_ENTRY(StackEntry) node;
} StackEntry; } StackEntry;
@ -39,6 +40,11 @@ static void qapi_dealloc_push(QapiDeallocVisitor *qov, void *value)
StackEntry *e = g_malloc0(sizeof(*e)); StackEntry *e = g_malloc0(sizeof(*e));
e->value = value; e->value = value;
/* see if we're just pushing a list head tracker */
if (value == NULL) {
e->is_list_head = true;
}
QTAILQ_INSERT_HEAD(&qov->stack, e, node); QTAILQ_INSERT_HEAD(&qov->stack, e, node);
} }
@ -72,7 +78,7 @@ static void qapi_dealloc_end_struct(Visitor *v, Error **errp)
static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp) static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
{ {
QapiDeallocVisitor *qov = to_qov(v); QapiDeallocVisitor *qov = to_qov(v);
qov->is_list_head = true; qapi_dealloc_push(qov, NULL);
} }
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp, static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
@ -80,19 +86,27 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
{ {
GenericList *list = *listp; GenericList *list = *listp;
QapiDeallocVisitor *qov = to_qov(v); QapiDeallocVisitor *qov = to_qov(v);
StackEntry *e = QTAILQ_FIRST(&qov->stack);
if (!qov->is_list_head) { if (e && e->is_list_head) {
*listp = list->next; e->is_list_head = false;
g_free(list); return list;
return *listp;
} }
qov->is_list_head = false; if (list) {
list = list->next;
g_free(*listp);
return list; return list;
} }
return NULL;
}
static void qapi_dealloc_end_list(Visitor *v, Error **errp) static void qapi_dealloc_end_list(Visitor *v, Error **errp)
{ {
QapiDeallocVisitor *qov = to_qov(v);
void *obj = qapi_dealloc_pop(qov);
assert(obj == NULL); /* should've been list head tracker with no payload */
} }
static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name, static void qapi_dealloc_type_str(Visitor *v, char **obj, const char *name,