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=-5.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,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 D23D4C433E1 for ; Thu, 2 Jul 2020 18:06:38 +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 9C63E20870 for ; Thu, 2 Jul 2020 18:06:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SoPZb6/O" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C63E20870 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]:39894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jr3bZ-0003Ry-Uy for qemu-devel@archiver.kernel.org; Thu, 02 Jul 2020 14:06:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jr3XV-0007sA-4D for qemu-devel@nongnu.org; Thu, 02 Jul 2020 14:02:25 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:28662 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jr3XT-0004sT-Ab for qemu-devel@nongnu.org; Thu, 02 Jul 2020 14:02:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593712942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FH13+T4SqJQVOHhM1HQAJZY1S4b2ABkvFWnofpmrYww=; b=SoPZb6/OLJy1IVyA3kgVR9O6pdaSqL9zSBZKsSR3kHjaxRHdeMVpZHJMUyqhIjgBm6HPtu qCG7g8QOaeZO2VfJ8SZ2Qy/x8kwAw+7JaNlOK5u54HCqLgHHsePdE1Bas2hvc9Ojwt+GlL Ol1F0xIcipi8uqlnsiCZy1Pz+KoRg/s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-447-JzynlPZ2M-iNKpkC0rMdlQ-1; Thu, 02 Jul 2020 14:02:15 -0400 X-MC-Unique: JzynlPZ2M-iNKpkC0rMdlQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 62566804001; Thu, 2 Jul 2020 18:02:14 +0000 (UTC) Received: from [10.3.112.202] (ovpn-112-202.phx2.redhat.com [10.3.112.202]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C61AC7925C; Thu, 2 Jul 2020 18:02:13 +0000 (UTC) Subject: Re: [PATCH v2 34/44] error: Eliminate error_propagate() with Coccinelle, part 1 To: Markus Armbruster , qemu-devel@nongnu.org References: <20200702155000.3455325-1-armbru@redhat.com> <20200702155000.3455325-35-armbru@redhat.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: <051702cf-dbc9-67ca-2ff2-3cf8d9eb9ed3@redhat.com> Date: Thu, 2 Jul 2020 13:02:13 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200702155000.3455325-35-armbru@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.81; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/02 04:18:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: peter.maydell@linaro.org, vsementsov@virtuozzo.com, berrange@redhat.com, ehabkost@redhat.com, qemu-block@nongnu.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 7/2/20 10:49 AM, Markus Armbruster wrote: > When all we do with an Error we receive into a local variable is > propagating to somewhere else, we can just as well receive it there > right away. Convert > > if (!foo(..., &err)) { > ... > error_propagate(errp, err); > ... > return ... > } > > to > > if (!foo(..., errp)) { > ... > ... > return ... > } > > > Not exactly elegant, I'm afraid. True, but it is still reasonable enough to use. > > The "when != goto lbl;" is necessary to avoid transforming spelled "when != lbl:" above in rule1 and rule2 > > if (fun(args, &err)) { > goto out > } > ... > out: > error_propagate(errp, err); > > even though other paths to label out still need the error_propagate(). > For an actual example, see sclp_realize(). > > Without the "when strict", Coccinelle transforms vfio_msix_setup(), > incorrectly. I don't know what exactly "when strict" does, only that > it helps here. > > The match of return is narrower than what I want, but I can't figure > out how to express "return where the operand doesn't use @err". For > an example where it's too narrow, see vfio_intx_enable(). > > Silently fails to convert hw/arm/armsse.c, because Coccinelle gets > confused by ARMSSE being used both as typedef and function-like macro > there. Converted manually. > > Line breaks tidied up manually. One nested declaration of @local_err > deleted manually. Preexisting unwanted blank line dropped in > hw/riscv/sifive_e.c. > > Signed-off-by: Markus Armbruster > --- > 114 files changed, 376 insertions(+), 884 deletions(-) Big, but sane. Picks up the spots I noticed in 33/44, and then some ;) Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org