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

qapi-visit: Unify struct and union visit 

gen_visit_union() is now just like gen_visit_struct().  Rename
it to gen_visit_object(), use it for structs, and drop
gen_visit_struct().  Output is unchanged.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1453902888-20457-4-git-send-email-armbru@redhat.com>
[split out variant handling, rebase to earlier changes]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1455778109-6278-8-git-send-email-eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2016-02-17 23:48:21 -07:00
parent 9a5cd424d5
commit 59d9e84cc9
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scripts/qapi-visit.py
View File

@ -155,40 +155,6 @@ out:
return ret return ret
def gen_visit_struct(name, base, members):
ret = gen_visit_struct_fields(name, base, members, None)
# FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to
# *obj, but then visit_type_FOO_fields() fails, we should clean up *obj
# rather than leaving it non-NULL. As currently written, the caller must
# call qapi_free_FOO() to avoid a memory leak of the partial FOO.
ret += mcgen('''
void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp)
{
Error *err = NULL;
visit_start_struct(v, name, (void **)obj, sizeof(%(c_name)s), &err);
if (err) {
goto out;
}
if (!*obj) {
goto out_obj;
}
visit_type_%(c_name)s_fields(v, obj, &err);
error_propagate(errp, err);
err = NULL;
out_obj:
visit_end_struct(v, &err);
out:
error_propagate(errp, err);
}
''',
c_name=c_name(name))
return ret
def gen_visit_list(name, element_type): def gen_visit_list(name, element_type):
# FIXME: if *obj is NULL on entry, and the first visit_next_list() # FIXME: if *obj is NULL on entry, and the first visit_next_list()
# assigns to *obj, while a later one fails, we should clean up *obj # assigns to *obj, while a later one fails, we should clean up *obj
@ -284,9 +250,13 @@ out:
return ret return ret
def gen_visit_union(name, base, members, variants): def gen_visit_object(name, base, members, variants):
ret = gen_visit_struct_fields(name, base, members, variants) ret = gen_visit_struct_fields(name, base, members, variants)
# FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to
# *obj, but then visit_type_FOO_fields() fails, we should clean up *obj
# rather than leaving it non-NULL. As currently written, the caller must
# call qapi_free_FOO() to avoid a memory leak of the partial FOO.
ret += mcgen(''' ret += mcgen('''
void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp) void visit_type_%(c_name)s(Visitor *v, const char *name, %(c_name)s **obj, Error **errp)
@ -363,10 +333,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor):
def visit_object_type(self, name, info, base, members, variants): def visit_object_type(self, name, info, base, members, variants):
self.decl += gen_visit_decl(name) self.decl += gen_visit_decl(name)
if variants: self.defn += gen_visit_object(name, base, members, variants)
self.defn += gen_visit_union(name, base, members, variants)
else:
self.defn += gen_visit_struct(name, base, members)
def visit_alternate_type(self, name, info, variants): def visit_alternate_type(self, name, info, variants):
self.decl += gen_visit_decl(name) self.decl += gen_visit_decl(name)