From patchwork Wed Dec 11 05:48:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 299810 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 799A22C031A for ; Wed, 11 Dec 2013 16:50:09 +1100 (EST) Received: from localhost ([::1]:53116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqcgQ-00075z-7b for incoming@patchwork.ozlabs.org; Wed, 11 Dec 2013 00:50:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49409) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqcdt-0003x2-6r for qemu-devel@nongnu.org; Wed, 11 Dec 2013 00:47:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vqcdl-0004s9-BP for qemu-devel@nongnu.org; Wed, 11 Dec 2013 00:47:29 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:47090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vqcdi-0004qe-3V for qemu-devel@nongnu.org; Wed, 11 Dec 2013 00:47:21 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 11 Dec 2013 11:17:15 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 11 Dec 2013 11:17:13 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 204B33940060 for ; Wed, 11 Dec 2013 11:17:13 +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 rBB5kv8p47644728 for ; Wed, 11 Dec 2013 11:16:57 +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 rBB5l1r4032624 for ; Wed, 11 Dec 2013 11:17:01 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id rBB5ktgw032323; Wed, 11 Dec 2013 11:17:00 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Wed, 11 Dec 2013 13:48:26 +0800 Message-Id: <1386740912-1655-4-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1386740912-1655-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1386740912-1655-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13121105-8878-0000-0000-00000A060C12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.7 Cc: kwolf@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH V4 3/9] qapi script: check correctness of discriminator values in union 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 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 aa91edc..3f50d52 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)