From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgQEG-0002g6-Vb for qemu-devel@nongnu.org; Tue, 12 Nov 2013 21:31:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VgQE8-0003RY-Uj for qemu-devel@nongnu.org; Tue, 12 Nov 2013 21:30:52 -0500 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:58111) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VgQE8-0003PE-67 for qemu-devel@nongnu.org; Tue, 12 Nov 2013 21:30:44 -0500 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 13 Nov 2013 08:00:36 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id EB3BF1258051 for ; Wed, 13 Nov 2013 08:01:21 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rAD2USBn33554438 for ; Wed, 13 Nov 2013 08:00:28 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id rAD2UVrP012305 for ; Wed, 13 Nov 2013 08:00:31 +0530 Message-ID: <5282E446.3040002@linux.vnet.ibm.com> Date: Wed, 13 Nov 2013 10:30:30 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1383766420-20745-1-git-send-email-xiawenc@linux.vnet.ibm.com> <1383766420-20745-4-git-send-email-xiawenc@linux.vnet.ibm.com> <52826F76.7030904@redhat.com> In-Reply-To: <52826F76.7030904@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 3/8] qapi script: check correctness of discriminator values in union List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com 于 2013/11/13 2:12, Eric Blake 写道: > On 11/06/2013 12:33 PM, Wenchao Xia wrote: >> It will check whether the values specified are written correctly when >> discriminator is a pre-defined enum type, which help check whether the >> schema is in good form. >> >> It is allowed, that not every value in enum is used, so does not check >> that case. > > Again, I think you should require that every value in the enum is used. > >> >> Signed-off-by: Wenchao Xia >> --- >> scripts/qapi-visit.py | 11 +++++++++++ >> scripts/qapi.py | 33 +++++++++++++++++++++++++++++++++ >> 2 files changed, 44 insertions(+), 0 deletions(-) >> >> diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py >> index b3d3af8..612dc4d 100644 >> --- a/scripts/qapi-visit.py >> +++ b/scripts/qapi-visit.py >> @@ -251,6 +251,17 @@ 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' not found in " >> + "enum '%s'\n" % >> + (key, enum_define["enum_name"])) >> + sys.exit(1) > > This checks for union branches not covered by the enum, but does not > check for duplicate union branches, nor does it check for enum values > not covered by a union branch. > I agree that, allowing enum values not covered by union branch, require more carefully error handling for caller, such as visitors, will add the check for safty reason.