[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed to visitors |
Date: |
Fri, 28 Aug 2015 18:45:51 +0200 |
The generated code passes mangled schema names to visit_type_enum()
and union's visit_start_struct(). Fix it to pass the names
unadulterated, like we do everywhere else.
Only qapi-schema-test.json actually has names where this makes a
difference: enum __org.qemu_x-Enum, flat union __org.qemu_x-Union2,
simple union __org.qemu_x-Union1 and its implicit enum
__org.qemu_x-Union1Kind.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-visit.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 9fc040e..73f136f 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -185,12 +185,12 @@ out:
def generate_visit_enum(name):
return mcgen('''
-void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error
**errp)
+void visit_type_%(c_name)s(Visitor *m, %(c_name)s *obj, const char *name,
Error **errp)
{
- visit_type_enum(m, (int *)obj, %(name)s_lookup, "%(name)s", name, errp);
+ visit_type_enum(m, (int *)obj, %(c_name)s_lookup, "%(name)s", name, errp);
}
''',
- name=c_name(name))
+ c_name=c_name(name), name=name)
def generate_visit_alternate(name, members):
ret = mcgen('''
@@ -278,17 +278,17 @@ def generate_visit_union(expr):
ret += mcgen('''
-void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error
**errp)
+void visit_type_%(c_name)s(Visitor *m, %(c_name)s **obj, const char *name,
Error **errp)
{
Error *err = NULL;
- visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s),
&err);
+ visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(c_name)s),
&err);
if (err) {
goto out;
}
if (*obj) {
''',
- name=c_name(name))
+ c_name=c_name(name), name=name)
if base:
ret += mcgen('''
--
2.4.3
- [Qemu-devel] [PATCH v2 00/26] qapi: Another round of fixes and cleanups, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 05/26] qapi: Reject -p arguments that break qapi-event.py, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 12/26] tests/qapi-schema: Document alternate's enum lacks visit function, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 04/26] qapi-event: Clean up how name of enum QAPIEvent is made, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 10/26] qapi-visit: Replace list implicit_structs by set, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 01/26] qapi: Clarify docs on including the same file multiple times, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 03/26] qapi: Simplify guardname(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 02/26] qapi: Clean up cgen() and mcgen(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed to visitors,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 08/26] qapi: Generate a nicer struct for flat unions, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 13/26] tests/qapi-schema: Document events with base don't work, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 07/26] qapi: Fix generated code when flat union has member 'kind', Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 16/26] qapi: Document flaws in checking of names, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 09/26] qapi-visit: Fix generated code when schema has forward refs, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 06/26] qapi: Drop unused and useless parameters and variables, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 23/26] qapi-commands: Inline gen_marshal_output_call(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 17/26] tests/qapi-schema: Restore test case for flat union base bug, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 14/26] qapi: Document that input visitor semantics are prone to leaks, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 19/26] qapi-tests: New tests for union, alternate command arguments, Markus Armbruster, 2015/08/28