From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgtv-0000cO-Rb for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTgtu-0005n8-No for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:43 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:33189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgtu-0005k6-JV for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:42 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so2893446iea.4 for ; Wed, 31 Oct 2012 15:36:42 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Wed, 31 Oct 2012 17:35:52 -0500 Message-Id: <1351722972-17801-9-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 08/28] qapi: qapi_visit.py, support for q_string annotations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Signed-off-by: Michael Roth --- 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