[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 08/25] qapi-visit: Split off visit_type_FOO_fields
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 08/25] qapi-visit: Split off visit_type_FOO_fields forward decl |
Date: |
Mon, 2 Nov 2015 10:13:13 +0100 |
From: Eric Blake <address@hidden>
We generate a static visit_type_FOO_fields() for every type
FOO. However, sometimes we need a forward declaration. Split
the code to generate the forward declaration out of
gen_visit_implicit_struct() into a new gen_visit_fields_decl(),
and also prepare for a forward declaration to be emitted
during gen_visit_struct(), so that a future patch can switch
from using visit_type_FOO_implicit() to the simpler
visit_type_FOO_fields() as part of unboxing the base class
of a struct.
No change to generated code.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-visit.py | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 2dc3aed..d4408f2 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -15,7 +15,12 @@
from qapi import *
import re
+# visit_type_FOO_implicit() is emitted as needed; track if it has already
+# been output.
implicit_structs_seen = set()
+
+# visit_type_FOO_fields() is always emitted; track if a forward declaration
+# or implementation has already been output.
struct_fields_seen = set()
@@ -29,19 +34,24 @@ void visit_type_%(c_name)s(Visitor *v, %(c_type)sobj, const
char *name, Error **
c_name=c_name(name), c_type=c_type)
+def gen_visit_fields_decl(typ):
+ ret = ''
+ if typ.name not in struct_fields_seen:
+ ret += mcgen('''
+
+static void visit_type_%(c_type)s_fields(Visitor *v, %(c_type)s **obj, Error
**errp);
+''',
+ c_type=typ.c_name())
+ struct_fields_seen.add(typ.name)
+ return ret
+
+
def gen_visit_implicit_struct(typ):
if typ in implicit_structs_seen:
return ''
implicit_structs_seen.add(typ)
- ret = ''
- if typ.name not in struct_fields_seen:
- # Need a forward declaration
- ret += mcgen('''
-
-static void visit_type_%(c_type)s_fields(Visitor *v, %(c_type)s **obj, Error
**errp);
-''',
- c_type=typ.c_name())
+ ret = gen_visit_fields_decl(typ)
ret += mcgen('''
--
2.4.3
- [Qemu-devel] [PULL v2 00/25] QAPI patches, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 01/25] qapi-schema: mark InetSocketAddress as mandatory again, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 08/25] qapi-visit: Split off visit_type_FOO_fields forward decl,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 05/25] qapi: Reserve '*List' type names for list types, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 07/25] vnc: Hoist allocation of VncBasicInfo to callers, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 10/25] qapi: Prefer typesafe upcasts to qapi base classes, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 03/25] qapi: More idiomatic string operations, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 04/25] qapi: More robust conditions for when labels are needed, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 02/25] tests/qapi-schema: Test for reserved names, empty struct, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 14/25] qapi-visit: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 22/25] tpm: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 06/25] qapi: Reserve 'q_*' and 'has_*' member names, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 12/25] qapi-visit: Remove redundant functions for flat union base, Markus Armbruster, 2015/11/02