|
@@ -12,9 +12,8 @@
|
|
from ordereddict import OrderedDict
|
|
from ordereddict import OrderedDict
|
|
from qapi import *
|
|
from qapi import *
|
|
|
|
|
|
-def generate_fwd_struct(name, builtin_type=False):
|
|
|
|
- if builtin_type:
|
|
|
|
- return mcgen('''
|
|
|
|
|
|
+def generate_fwd_builtin(name):
|
|
|
|
+ return mcgen('''
|
|
|
|
|
|
typedef struct %(name)sList
|
|
typedef struct %(name)sList
|
|
{
|
|
{
|
|
@@ -25,9 +24,10 @@ def generate_fwd_struct(name, builtin_type=False):
|
|
struct %(name)sList *next;
|
|
struct %(name)sList *next;
|
|
} %(name)sList;
|
|
} %(name)sList;
|
|
''',
|
|
''',
|
|
- type=c_type(name),
|
|
|
|
- name=name)
|
|
|
|
|
|
+ type=c_type(name),
|
|
|
|
+ name=name)
|
|
|
|
|
|
|
|
+def generate_fwd_struct(name):
|
|
return mcgen('''
|
|
return mcgen('''
|
|
|
|
|
|
typedef struct %(name)s %(name)s;
|
|
typedef struct %(name)s %(name)s;
|
|
@@ -332,7 +332,7 @@ def generate_type_cleanup(name):
|
|
|
|
|
|
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
for typename in builtin_types.keys():
|
|
for typename in builtin_types.keys():
|
|
- fdecl.write(generate_fwd_struct(typename, builtin_type=True))
|
|
|
|
|
|
+ fdecl.write(generate_fwd_builtin(typename))
|
|
fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
|
|
|
|
for expr in exprs:
|
|
for expr in exprs:
|