From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6Do-0003EP-EW for qemu-devel@nongnu.org; Tue, 11 Feb 2014 00:49:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WD6DW-0003qU-Mr for qemu-devel@nongnu.org; Tue, 11 Feb 2014 00:49:28 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:53414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WD6DW-0003qH-2o for qemu-devel@nongnu.org; Tue, 11 Feb 2014 00:49:10 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 11 Feb 2014 11:19:07 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id C3FAA394005C for ; Tue, 11 Feb 2014 11:19:04 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s1B5n0JU45809886 for ; Tue, 11 Feb 2014 11:19:00 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s1B5n3U5030441 for ; Tue, 11 Feb 2014 11:19:03 +0530 From: Wenchao Xia Date: Tue, 11 Feb 2014 05:48:34 +0800 Message-Id: <1392068921-3327-4-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1392068921-3327-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1392068921-3327-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V6 03/10] qapi script: check correctness of discriminator values in union List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com, Wenchao Xia It will check whether the values specified are written correctly, and whether all enum values are covered, when discriminator is a pre-defined enum type Signed-off-by: Wenchao Xia Reviewed-by: Eric Blake --- scripts/qapi-visit.py | 17 +++++++++++++++++ scripts/qapi.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 65f1a54..c0efb5f 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -255,6 +255,23 @@ def generate_visit_union(expr): assert not base return generate_visit_anon_union(name, members) + # If discriminator is specified and it is a pre-defined enum in schema, + # check its correctness + enum_define = discriminator_find_enum_define(expr) + if enum_define: + for key in members: + if not key in enum_define["enum_values"]: + sys.stderr.write("Discriminator value '%s' is not found in " + "enum '%s'\n" % + (key, enum_define["enum_name"])) + sys.exit(1) + for key in enum_define["enum_values"]: + if not key in members: + sys.stderr.write("Enum value '%s' is not covered by a branch " + "of union '%s'\n" % + (key, name)) + sys.exit(1) + ret = generate_visit_enum('%sKind' % name, members.keys()) if base: diff --git a/scripts/qapi.py b/scripts/qapi.py index cf34768..0a3ab80 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -385,3 +385,34 @@ def guardend(name): ''', name=guardname(name)) + +# This function can be used to check whether "base" is valid +def find_base_fields(base): + base_struct_define = find_struct(base) + if not base_struct_define: + return None + return base_struct_define.get('data') + +# Return the discriminator enum define, if discriminator is specified in +# @expr and it is a pre-defined enum type +def discriminator_find_enum_define(expr): + discriminator = expr.get('discriminator') + base = expr.get('base') + + # Only support discriminator when base present + if not (discriminator and base): + return None + + base_fields = find_base_fields(base) + + if not base_fields: + raise StandardError("Base '%s' is not a valid type\n" + % base) + + discriminator_type = base_fields.get(discriminator) + + if not discriminator_type: + raise StandardError("Discriminator '%s' not found in schema\n" + % discriminator) + + return find_enum(discriminator_type) -- 1.7.1