[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string ann
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string annotations |
Date: |
Wed, 31 Oct 2012 17:35:52 -0500 |
Signed-off-by: Michael Roth <address@hidden>
---
scripts/qapi_visit.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi_visit.py b/scripts/qapi_visit.py
index c531a5a..b3c6bfe 100644
--- a/scripts/qapi_visit.py
+++ b/scripts/qapi_visit.py
@@ -18,6 +18,14 @@ import getopt
import errno
import types
+def generate_visit_carray_as_string(name, info):
+ return mcgen('''
+char *%(name)s_ptr = (char *)&(*obj)->%(name)s;
+visit_type_str(m, &%(name)s_ptr, "%(name)s", errp);
+''',
+ name=name)
+
+
def generate_visit_carray_body(name, info):
if info['array_size'][0].isdigit():
array_size = info['array_size']
@@ -144,7 +152,10 @@ if (obj && (*obj)->%(prefix)shas_%(c_name)s) {
else:
if annotated:
if isinstance(argentry['type'], types.ListType):
- ret += generate_visit_carray_body(argname, argentry)
+ if argentry.has_key('is_string') and argentry['is_string']
== 'true':
+ ret += generate_visit_carray_as_string(argname,
argentry)
+ else:
+ ret += generate_visit_carray_body(argname, argentry)
elif argentry.has_key('embedded') and argentry['embedded'] ==
'true':
tmp_ptr_name = "%s_%s_ptr" %
(c_var(field_prefix).replace(".", ""), c_var(argname))
ret += mcgen('''
--
1.7.9.5
- [Qemu-devel] [PATCH v6 00/28] Add infrastructure for QIDL-based device serialization (Happy Halloween Edition), Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 01/28] qapi: qapi-visit.py -> qapi_visit.py so we can import, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 03/28] qapi: qapi-commands.py -> qapi_commands.py, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 06/28] qapi: qapi_visit.py, support generating static functions, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 02/28] qapi: qapi-types.py -> qapi_types.py, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 04/28] qapi: qapi_visit.py, make code useable as module, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 05/28] qapi: qapi_visit.py, support arrays and complex qapi definitions, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 07/28] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string annotations,
Michael Roth <=
- [Qemu-devel] [PATCH 11/28] qapi: QmpInputVisitor, implement array handling, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 16/28] qapi: qapi.py, make json parser more robust, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 14/28] qapi: add visit_type_long(), Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 13/28] qapi: fix potential segfault for visit_type_size(), Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 09/28] qapi: add visitor interfaces for C arrays, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 12/28] qapi: QmpInputVisitor, don't re-allocate memory in start_struct, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 19/28] qom-fuse: force single-threaded mode to avoid QMP races, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 20/28] qom-fuse: workaround for truncated properties > 4096, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 10/28] qapi: QmpOutputVisitor, implement array handling, Michael Roth, 2012/10/31
- [Qemu-devel] [PATCH 15/28] qapi: ordereddict, add to_json() method, Michael Roth, 2012/10/31