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.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 4C049C433DF for ; Wed, 24 Jun 2020 20:09:04 +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 1B9DE2081A for ; Wed, 24 Jun 2020 20:09:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KX+IVvkh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B9DE2081A 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]:50584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joBhf-0001T8-9w for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 16:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joBh1-0000wE-MI for qemu-devel@nongnu.org; Wed, 24 Jun 2020 16:08:23 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33074 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 1joBgz-0003yC-0t for qemu-devel@nongnu.org; Wed, 24 Jun 2020 16:08:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593029299; 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=wAqkXVg57F3d+gNp1EtTLlN9fm0uuU7i6EMPs5GYDqQ=; b=KX+IVvkhOsGRbBF3o2UcN1Lw9z9nO2xIjL2OAK3Vt/RTSIjwEpiKNOn4Y6bFocjqjmYfwp mS8nFdIl/KfRL1+lksOeUTb8STZInkHptHdgkwJX73wD6ESxLLAfJP0p5DjoxEX73EdGBD GN1eKCgeqDnHqWKQPs+BbgNzRLYARvY= 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-304-rfuf20LJMkCUmS5VbjOjiw-1; Wed, 24 Jun 2020 16:08:13 -0400 X-MC-Unique: rfuf20LJMkCUmS5VbjOjiw-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 99CC5107ACF5; Wed, 24 Jun 2020 20:08:12 +0000 (UTC) Received: from [10.3.114.107] (ovpn-114-107.phx2.redhat.com [10.3.114.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E8A8560C1D; Wed, 24 Jun 2020 20:08:11 +0000 (UTC) Subject: Re: [PATCH 17/46] qemu-option: Smooth error checking with Coccinelle To: Markus Armbruster , qemu-devel@nongnu.org References: <20200624164344.3778251-1-armbru@redhat.com> <20200624164344.3778251-18-armbru@redhat.com> From: Eric Blake Organization: Red Hat, Inc. Message-ID: <7368e632-8cdb-f6cd-65b5-5d1e14c61459@redhat.com> Date: Wed, 24 Jun 2020 15:08:11 -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: <20200624164344.3778251-18-armbru@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=205.139.110.61; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 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 6/24/20 11:43 AM, Markus Armbruster wrote: > The previous commit enables conversion of > > foo(..., &err); > if (err) { > ... > } > > to > > if (!foo(..., &err)) { > ... > } > > for QemuOpts functions that now return true / false on success / > error. Coccinelle script: > > > Eliminate error_propagate() that are now unnecessary. Delete @err > that are now unused. Tidy up line breaks and whitespace. > > Signed-off-by: Markus Armbruster > --- > 32 files changed, 70 insertions(+), 192 deletions(-) Another decent chunk of cleanups. > > diff --git a/block.c b/block.c > index 30a72bc4c2..77e85f13db 100644 > --- a/block.c > +++ b/block.c > @@ -6091,8 +6086,8 @@ void bdrv_img_create(const char *filename, const char *fmt, > } > > if (base_filename) { > - qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, &local_err); > - if (local_err) { > + if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, > + &local_err)) { > error_setg(errp, "Backing file not supported for file format '%s'", > fmt); Pre-existing - it is odd that we collect a message into local_err, then write something else into errp; the out: label does error_propagate(errp, local_err) which ensures there is no leak but discards the original err. You could pass NULL instead. But as it is pre-existing, passing NULL should be a separate patch. > goto out; > @@ -6100,8 +6095,7 @@ void bdrv_img_create(const char *filename, const char *fmt, > } > > if (base_fmt) { > - qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &local_err); > - if (local_err) { > + if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &local_err)) { > error_setg(errp, "Backing file format not supported for file " > "format '%s'", fmt); Ditto. > +++ b/qemu-img.c > @@ -467,8 +467,8 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts, > Error *err = NULL; > > if (base_filename) { > - qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, &err); > - if (err) { > + if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, base_filename, > + &err)) { > error_report("Backing file not supported for file format '%s'", > fmt); > error_free(err); > @@ -476,8 +476,7 @@ static int add_old_style_options(const char *fmt, QemuOpts *opts, > } > } > if (base_fmt) { > - qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &err); > - if (err) { > + if (!qemu_opt_set(opts, BLOCK_OPT_BACKING_FMT, base_fmt, &err)) { > error_report("Backing file format not supported for file " > "format '%s'", fmt); > error_free(err); Ditto. But the conversion here is sane. Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org