|
|
218e99 |
From f45283cb91d07fd280fcf503a486effc1a96fa5e Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Date: Mon, 9 Sep 2013 14:28:15 +0200
|
|
|
218e99 |
Subject: [PATCH 24/38] qapi: qapi-types.py, native list support
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
Message-id: <1378736903-18489-25-git-send-email-kwolf@redhat.com>
|
|
|
218e99 |
Patchwork-id: 54211
|
|
|
218e99 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 24/32] qapi: qapi-types.py, native list support
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 1005818
|
|
|
218e99 |
|
|
|
218e99 |
Teach type generators about native types so they can generate the
|
|
|
218e99 |
appropriate linked list types.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
218e99 |
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Reviewed-by: Amos Kong <akong@redhat.com>
|
|
|
218e99 |
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
218e99 |
(cherry picked from commit c0afa9c5f717d0ebf10c70c305974ebbffe4c71f)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
scripts/qapi-types.py | 45 ++++++++++++++++++++++++++++++++++++++++++---
|
|
|
218e99 |
scripts/qapi.py | 23 +++++++++++++++++++++++
|
|
|
218e99 |
2 files changed, 65 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
scripts/qapi-types.py | 45 ++++++++++++++++++++++++++++++++++++++++++---
|
|
|
218e99 |
scripts/qapi.py | 23 +++++++++++++++++++++++
|
|
|
218e99 |
2 files changed, 65 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
|
|
|
218e99 |
index f139bfe..3d9af3c 100644
|
|
|
218e99 |
--- a/scripts/qapi-types.py
|
|
|
218e99 |
+++ b/scripts/qapi-types.py
|
|
|
218e99 |
@@ -16,8 +16,21 @@ import os
|
|
|
218e99 |
import getopt
|
|
|
218e99 |
import errno
|
|
|
218e99 |
|
|
|
218e99 |
-def generate_fwd_struct(name, members):
|
|
|
218e99 |
+def generate_fwd_struct(name, members, builtin_type=False):
|
|
|
218e99 |
+ if builtin_type:
|
|
|
218e99 |
+ return mcgen('''
|
|
|
218e99 |
+
|
|
|
218e99 |
+typedef struct %(name)sList
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ %(type)s value;
|
|
|
218e99 |
+ struct %(name)sList *next;
|
|
|
218e99 |
+} %(name)sList;
|
|
|
218e99 |
+''',
|
|
|
218e99 |
+ type=c_type(name),
|
|
|
218e99 |
+ name=name)
|
|
|
218e99 |
+
|
|
|
218e99 |
return mcgen('''
|
|
|
218e99 |
+
|
|
|
218e99 |
typedef struct %(name)s %(name)s;
|
|
|
218e99 |
|
|
|
218e99 |
typedef struct %(name)sList
|
|
|
218e99 |
@@ -183,6 +196,7 @@ void qapi_free_%(type)s(%(c_type)s obj);
|
|
|
218e99 |
|
|
|
218e99 |
def generate_type_cleanup(name):
|
|
|
218e99 |
ret = mcgen('''
|
|
|
218e99 |
+
|
|
|
218e99 |
void qapi_free_%(type)s(%(c_type)s obj)
|
|
|
218e99 |
{
|
|
|
218e99 |
QapiDeallocVisitor *md;
|
|
|
218e99 |
@@ -203,8 +217,9 @@ void qapi_free_%(type)s(%(c_type)s obj)
|
|
|
218e99 |
|
|
|
218e99 |
|
|
|
218e99 |
try:
|
|
|
218e99 |
- opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:",
|
|
|
218e99 |
- ["source", "header", "prefix=", "output-dir="])
|
|
|
218e99 |
+ opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
|
|
|
218e99 |
+ ["source", "header", "builtins",
|
|
|
218e99 |
+ "prefix=", "output-dir="])
|
|
|
218e99 |
except getopt.GetoptError, err:
|
|
|
218e99 |
print str(err)
|
|
|
218e99 |
sys.exit(1)
|
|
|
218e99 |
@@ -216,6 +231,7 @@ h_file = 'qapi-types.h'
|
|
|
218e99 |
|
|
|
218e99 |
do_c = False
|
|
|
218e99 |
do_h = False
|
|
|
218e99 |
+do_builtins = False
|
|
|
218e99 |
|
|
|
218e99 |
for o, a in opts:
|
|
|
218e99 |
if o in ("-p", "--prefix"):
|
|
|
218e99 |
@@ -226,6 +242,8 @@ for o, a in opts:
|
|
|
218e99 |
do_c = True
|
|
|
218e99 |
elif o in ("-h", "--header"):
|
|
|
218e99 |
do_h = True
|
|
|
218e99 |
+ elif o in ("-b", "--builtins"):
|
|
|
218e99 |
+ do_builtins = True
|
|
|
218e99 |
|
|
|
218e99 |
if not do_c and not do_h:
|
|
|
218e99 |
do_c = True
|
|
|
218e99 |
@@ -301,6 +319,11 @@ fdecl.write(mcgen('''
|
|
|
218e99 |
exprs = parse_schema(sys.stdin)
|
|
|
218e99 |
exprs = filter(lambda expr: not expr.has_key('gen'), exprs)
|
|
|
218e99 |
|
|
|
218e99 |
+fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
|
218e99 |
+for typename in builtin_types:
|
|
|
218e99 |
+ fdecl.write(generate_fwd_struct(typename, None, builtin_type=True))
|
|
|
218e99 |
+fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
|
|
218e99 |
+
|
|
|
218e99 |
for expr in exprs:
|
|
|
218e99 |
ret = "\n"
|
|
|
218e99 |
if expr.has_key('type'):
|
|
|
218e99 |
@@ -317,6 +340,22 @@ for expr in exprs:
|
|
|
218e99 |
continue
|
|
|
218e99 |
fdecl.write(ret)
|
|
|
218e99 |
|
|
|
218e99 |
+# to avoid header dependency hell, we always generate declarations
|
|
|
218e99 |
+# for built-in types in our header files and simply guard them
|
|
|
218e99 |
+fdecl.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))
|
|
|
218e99 |
+for typename in builtin_types:
|
|
|
218e99 |
+ fdecl.write(generate_type_cleanup_decl(typename + "List"))
|
|
|
218e99 |
+fdecl.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))
|
|
|
218e99 |
+
|
|
|
218e99 |
+# ...this doesn't work for cases where we link in multiple objects that
|
|
|
218e99 |
+# have the functions defined, so we use -b option to provide control
|
|
|
218e99 |
+# over these cases
|
|
|
218e99 |
+if do_builtins:
|
|
|
218e99 |
+ fdef.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))
|
|
|
218e99 |
+ for typename in builtin_types:
|
|
|
218e99 |
+ fdef.write(generate_type_cleanup(typename + "List"))
|
|
|
218e99 |
+ fdef.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))
|
|
|
218e99 |
+
|
|
|
218e99 |
for expr in exprs:
|
|
|
218e99 |
ret = "\n"
|
|
|
218e99 |
if expr.has_key('type'):
|
|
|
218e99 |
diff --git a/scripts/qapi.py b/scripts/qapi.py
|
|
|
218e99 |
index 03c42a9..3a54c7f 100644
|
|
|
218e99 |
--- a/scripts/qapi.py
|
|
|
218e99 |
+++ b/scripts/qapi.py
|
|
|
218e99 |
@@ -11,6 +11,12 @@
|
|
|
218e99 |
|
|
|
218e99 |
from ordereddict import OrderedDict
|
|
|
218e99 |
|
|
|
218e99 |
+builtin_types = [
|
|
|
218e99 |
+ 'str', 'int', 'number', 'bool',
|
|
|
218e99 |
+ 'int8', 'int16', 'int32', 'int64',
|
|
|
218e99 |
+ 'uint8', 'uint16', 'uint32', 'uint64'
|
|
|
218e99 |
+]
|
|
|
218e99 |
+
|
|
|
218e99 |
def tokenize(data):
|
|
|
218e99 |
while len(data):
|
|
|
218e99 |
ch = data[0]
|
|
|
218e99 |
@@ -274,3 +280,20 @@ def guardname(filename):
|
|
|
218e99 |
for substr in [".", " ", "-"]:
|
|
|
218e99 |
guard = guard.replace(substr, "_")
|
|
|
218e99 |
return guard.upper() + '_H'
|
|
|
218e99 |
+
|
|
|
218e99 |
+def guardstart(name):
|
|
|
218e99 |
+ return mcgen('''
|
|
|
218e99 |
+
|
|
|
218e99 |
+#ifndef %(name)s
|
|
|
218e99 |
+#define %(name)s
|
|
|
218e99 |
+
|
|
|
218e99 |
+''',
|
|
|
218e99 |
+ name=guardname(name))
|
|
|
218e99 |
+
|
|
|
218e99 |
+def guardend(name):
|
|
|
218e99 |
+ return mcgen('''
|
|
|
218e99 |
+
|
|
|
218e99 |
+#endif /* %(name)s */
|
|
|
218e99 |
+
|
|
|
218e99 |
+''',
|
|
|
218e99 |
+ name=guardname(name))
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|