From patchwork Fri Jun 27 19:41:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 365184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ACA4D140080 for ; Sat, 28 Jun 2014 06:58:16 +1000 (EST) Received: from localhost ([::1]:52229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c35-0003ro-Eu for incoming@patchwork.ozlabs.org; Fri, 27 Jun 2014 15:43:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c2P-0002pr-C4 for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X0c2G-0001Zp-PR for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25639) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X0c2G-0001Zc-HS for qemu-devel@nongnu.org; Fri, 27 Jun 2014 15:42:12 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5RJg8I5017912 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Jun 2014 15:42:08 -0400 Received: from localhost (ovpn-113-142.phx2.redhat.com [10.3.113.142]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5RJg8Ov013861; Fri, 27 Jun 2014 15:42:08 -0400 From: Luiz Capitulino To: peter.maydell@linaro.org Date: Fri, 27 Jun 2014 15:41:58 -0400 Message-Id: <1403898123-22963-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403898123-22963-1-git-send-email-lcapitulino@redhat.com> References: <1403898123-22963-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws Subject: [Qemu-devel] [PULL 3/8] qapi script: clean up in scripts X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wenchao Xia This patch improve docs and uses c_type(argentry, is_param=True) in script. Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- docs/qapi-code-gen.txt | 8 ++++---- scripts/qapi-event.py | 5 ++--- scripts/qapi.py | 2 +- tests/qapi-schema/event-nest-struct.err | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index 3a0c99e..a6197a9 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -218,10 +218,10 @@ An example command is: === Events === Events are defined with the keyword 'event'. When 'data' is also specified, -additional info will be carried on. Finally there will be C API generated -in qapi-event.h; when called by QEMU code, a message with timestamp will -be emitted on the wire. If timestamp is -1, it means failure to retrieve host -time. +additional info will be included in the event. Finally there will be C API +generated in qapi-event.h; when called by QEMU code, a message with timestamp +will be emitted on the wire. If timestamp is -1, it means failure to retrieve +host time. An example event is: diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index 3a1cd61..601e307 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -26,9 +26,8 @@ def _generate_event_api_name(event_name, params): api_name += "bool has_%s,\n" % c_var(argname) api_name += "".ljust(l) - if argentry == "str": - api_name += "const " - api_name += "%s %s,\n" % (c_type(argentry), c_var(argname)) + api_name += "%s %s,\n" % (c_type(argentry, is_param=True), + c_var(argname)) api_name += "".ljust(l) api_name += "Error **errp)" diff --git a/scripts/qapi.py b/scripts/qapi.py index 54b97cb..f2c6d1f 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -255,7 +255,7 @@ def check_event(expr, expr_info): if structured: raise QAPIExprError(expr_info, "Nested structure define in event is not " - "supported now, event '%s', argname '%s'" + "supported, event '%s', argname '%s'" % (expr['event'], argname)) def check_union(expr, expr_info): diff --git a/tests/qapi-schema/event-nest-struct.err b/tests/qapi-schema/event-nest-struct.err index e4a0faa..91bde1c 100644 --- a/tests/qapi-schema/event-nest-struct.err +++ b/tests/qapi-schema/event-nest-struct.err @@ -1 +1 @@ -tests/qapi-schema/event-nest-struct.json:1: Nested structure define in event is not supported now, event 'EVENT_A', argname 'a' +tests/qapi-schema/event-nest-struct.json:1: Nested structure define in event is not supported, event 'EVENT_A', argname 'a'