From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B2D5C47404 for ; Fri, 11 Oct 2019 17:58:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0F850206A1 for ; Fri, 11 Oct 2019 17:58:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F850206A1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIzBm-00017S-In for qemu-devel@archiver.kernel.org; Fri, 11 Oct 2019 13:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47482) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIyTs-0004jm-Q3 for qemu-devel@nongnu.org; Fri, 11 Oct 2019 13:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIyTr-0008Hq-EO for qemu-devel@nongnu.org; Fri, 11 Oct 2019 13:13:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIyTl-0008D5-Qi; Fri, 11 Oct 2019 13:13:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ABE5711A23; Fri, 11 Oct 2019 17:13:24 +0000 (UTC) Received: from [10.3.116.168] (ovpn-116-168.phx2.redhat.com [10.3.116.168]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F02B560923; Fri, 11 Oct 2019 17:12:49 +0000 (UTC) Subject: Re: [RFC v5 025/126] scripts: add coccinelle script to use auto propagated errp To: Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org References: <20191011160552.22907-1-vsementsov@virtuozzo.com> <20191011160552.22907-26-vsementsov@virtuozzo.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: <5dd4d642-7ea6-42a2-66fc-6d6710b77b8d@redhat.com> Date: Fri, 11 Oct 2019 12:12:49 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <20191011160552.22907-26-vsementsov@virtuozzo.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 Oct 2019 17:13:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Jeff Cody , Jan Kiszka , Alberto Garcia , Hailiang Zhang , qemu-block@nongnu.org, Aleksandar Rikalo , Halil Pasic , =?UTF-8?Q?Herv=c3=a9_Poussineau?= , Anthony Perard , Samuel Thibault , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Anthony Green , Laurent Vivier , Eduardo Habkost , Xie Changlong , Peter Lieven , "Dr. David Alan Gilbert" , Beniamino Galvani , Eric Auger , Alex Williamson , Ronnie Sahlberg , John Snow , Richard Henderson , Kevin Wolf , Andrew Jeffery , Chris Wulff , Subbaraya Sundeep , Michael Walle , qemu-ppc@nongnu.org, Bastian Koppelmann , Igor Mammedov , Fam Zheng , Peter Maydell , sheepdog@lists.wpkg.org, Matthew Rosato , David Hildenbrand , Palmer Dabbelt , Thomas Huth , Max Filippov , "Denis V. Lunev" , Hannes Reinecke , Stefano Stabellini , "Gonglei \(Arei\)" , Liu Yuan , Artyom Tarasenko , Eric Farman , Amit Shah , Stefan Weil , Greg Kurz , Yuval Shaia , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Peter Chubb , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , Stafford Horne , qemu-riscv@nongnu.org, Cornelia Huck , Aleksandar Markovic , Aurelien Jarno , Paul Burton , Sagar Karandikar , Paul Durrant , Jason Wang , Gerd Hoffmann , "Edgar E. Iglesias" , Guan Xuetao , Ari Sundholm , Juan Quintela , Michael Roth , Christian Borntraeger , Joel Stanley , Jason Dillaman , Antony Pavlov , xen-devel@lists.xenproject.org, integration@gluster.org, Laszlo Ersek , "Richard W.M. Jones" , Andrew Baumann , Max Reitz , "Michael S. Tsirkin" , Mark Cave-Ayland , Vincenzo Maffione , Marek Vasut , armbru@redhat.com, =?UTF-8?Q?Marc-Andr=c3=a9_Lureau?= , Alistair Francis , Pavel Dovgalyuk , Giuseppe Lettieri , Luigi Rizzo , David Gibson , Tony Krowiak , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Xiao Guangrong , Pierre Morel , Wen Congyang , Jean-Christophe Dubois , Paolo Bonzini , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/11/19 11:04 AM, Vladimir Sementsov-Ogievskiy wrote: > Signed-off-by: Vladimir Sementsov-Ogievskiy > --- > > scripts/coccinelle/auto-propagated-errp.cocci | 118 ++++++++++++++++++ > 1 file changed, 118 insertions(+) > create mode 100644 scripts/coccinelle/auto-propagated-errp.cocci > > diff --git a/scripts/coccinelle/auto-propagated-errp.cocci b/scripts/coccinelle/auto-propagated-errp.cocci > new file mode 100644 > index 0000000000..d9731620aa > --- /dev/null > +++ b/scripts/coccinelle/auto-propagated-errp.cocci > +@rule1@ > +// Drop local_err > +identifier fn, local_err; > +symbol errp; > +@@ > + > + fn(..., Error **errp, ...) > + { > + <... > +- Error *local_err = NULL; > + ...> > + } > + So our goal is to automate removal of all local_err (including when it is spelled err)... > +@@ > +// Handle pattern with goto, otherwise we'll finish up > +// with labels at function end which will not compile. > +identifier rule1.fn; > +identifier rule1.local_err; > +identifier OUT; > +@@ > + > + fn(...) > + { > + <... > +- goto OUT; > ++ return; > + ...> > +- OUT: > +- error_propagate(errp, local_err); > + } > + this dangling label cleanup makes sense > +@@ > +identifier rule1.fn; > +identifier rule1.local_err; > +@@ > + > + fn(...) > + { > + <... > +( > +- error_free(local_err); > +- local_err = NULL; > ++ error_free_errp(errp); This does not make sense - error_free_errp() is not defined prior to this series or anywhere in patches 1-24, if I'm reading it correctly. > +| > +- error_free(local_err); > ++ error_free_errp(errp); and again > +| > +- error_report_err(local_err); > ++ error_report_errp(errp); > +| > +- warn_report_err(local_err); > ++ warn_report_errp(errp); > +| > +- error_propagate_prepend(errp, local_err, > ++ error_prepend(errp, > + ...); > +| > +- error_propagate(errp, local_err); > +) > + ...> > + } > + It looks like once this script is run, error_propagate_prepend() will have no clients. Is there a non-generated cleanup patch that removes it (and once it is removed, it can also be removed from the .cocci script as no further clients will reappear later)? > +@@ > +identifier rule1.fn; > +identifier rule1.local_err; > +@@ > + > + fn(...) > + { > + <... > +( > +- &local_err > ++ errp > +| > +- local_err > ++ *errp > +) > + ...> > + } > + > +@@ > +symbol errp; > +@@ > + > +- *errp != NULL > ++ *errp > Seems to make sense. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org