From patchwork Wed Nov 6 19:33:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 289169 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 39CCD2C0331 for ; Thu, 7 Nov 2013 14:38:57 +1100 (EST) Received: from localhost ([::1]:37518 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeGOD-0004Lo-PH for incoming@patchwork.ozlabs.org; Wed, 06 Nov 2013 22:36:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeGMC-0003ao-4K for qemu-devel@nongnu.org; Wed, 06 Nov 2013 22:34:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeGM2-0007b8-1N for qemu-devel@nongnu.org; Wed, 06 Nov 2013 22:34:08 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:52523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeGM1-0007Zj-CV for qemu-devel@nongnu.org; Wed, 06 Nov 2013 22:33:57 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Nov 2013 09:03:50 +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; Thu, 7 Nov 2013 09:03:49 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id E865B394004E for ; Thu, 7 Nov 2013 09:03:24 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id rA73XhQq39649352 for ; Thu, 7 Nov 2013 09:03:43 +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 rA73XktP028647 for ; Thu, 7 Nov 2013 09:03:46 +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 rA73XgLF028447; Thu, 7 Nov 2013 09:03:45 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 03:33:34 +0800 Message-Id: <1383766420-20745-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1383766420-20745-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1383766420-20745-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13110703-8878-0000-0000-00000996226F 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, armbru@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 2/8] qapi script: report error for default case in union visit 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 is possible to reach default case, when an union have a enum discriminator, so don't abort() but report the error message. Signed-off-by: Wenchao Xia --- scripts/qapi-visit.py | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index c39e628..b3d3af8 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -223,6 +223,8 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** c_type = type_name(members[key]), c_name = c_fun(key)) + # Only support input visitor for an anon union now, and it is not possible + # to reach default, so abort() here, see the logic for (*obj)->kind ret += mcgen(''' default: abort(); @@ -312,15 +314,23 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** c_type=type_name(members[key]), c_name=c_fun(key)) + # Tell caller the value is invalid, since the discriminator value maybe an + # unmapped enum value. ret += mcgen(''' default: - abort(); + error_setg(&err, + "Invalid discriminator value %(pi)s for %(name)s", + (*obj)->kind); + break; } } error_propagate(errp, err); err = NULL; } -''') +''', + pi="%d", + name=name) + pop_indent() ret += mcgen(''' /* Always call end_struct if start_struct succeeded. */