qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com,
	blauwirbel@gmail.com, pbonzini@redhat.com
Subject: [Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string annotations
Date: Wed, 31 Oct 2012 17:35:52 -0500	[thread overview]
Message-ID: <1351722972-17801-9-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com>


Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 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

  parent reply	other threads:[~2012-10-31 22:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-31 22:35 [Qemu-devel] [PATCH v6 00/28] Add infrastructure for QIDL-based device serialization (Happy Halloween Edition) Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 01/28] qapi: qapi-visit.py -> qapi_visit.py so we can import Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 02/28] qapi: qapi-types.py -> qapi_types.py Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 03/28] qapi: qapi-commands.py -> qapi_commands.py Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 04/28] qapi: qapi_visit.py, make code useable as module Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 05/28] qapi: qapi_visit.py, support arrays and complex qapi definitions Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 06/28] qapi: qapi_visit.py, support generating static functions Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 07/28] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs Michael Roth
2012-10-31 22:35 ` Michael Roth [this message]
2012-10-31 22:35 ` [Qemu-devel] [PATCH 09/28] qapi: add visitor interfaces for C arrays Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 10/28] qapi: QmpOutputVisitor, implement array handling Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 11/28] qapi: QmpInputVisitor, " Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 12/28] qapi: QmpInputVisitor, don't re-allocate memory in start_struct Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 13/28] qapi: fix potential segfault for visit_type_size() Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 14/28] qapi: add visit_type_long() Michael Roth
2012-10-31 22:35 ` [Qemu-devel] [PATCH 15/28] qapi: ordereddict, add to_json() method Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 16/28] qapi: qapi.py, make json parser more robust Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 17/28] qapi: add open-coded visitors for struct tm/Int128 types Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 18/28] qapi: Improve existing docs and document annotated QAPI types Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 19/28] qom-fuse: force single-threaded mode to avoid QMP races Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 20/28] qom-fuse: workaround for truncated properties > 4096 Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 21/28] module additions for schema registration Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 22/28] qdev: move Property-related declarations to qdev-properties.h Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 23/28] qidl: add documentation Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 24/28] qidl: add lexer library (based on QC parser) Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 25/28] qidl: add C parser " Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 26/28] qidl: add QAPI-based code generator Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 27/28] qidl: qidl.h, definitions for qidl annotations Michael Roth
2012-10-31 22:36 ` [Qemu-devel] [PATCH 28/28] qidl: unit tests and build infrastructure Michael Roth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1351722972-17801-9-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=aliguori@us.ibm.com \
    --cc=blauwirbel@gmail.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).