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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 8940BC33C99 for ; Fri, 10 Jan 2020 06:07:49 +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 58A2D20673 for ; Fri, 10 Jan 2020 06:07:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58A2D20673 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=ispras.ru Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipnSW-0001LG-I9 for qemu-devel@archiver.kernel.org; Fri, 10 Jan 2020 01:07:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49533) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipnRs-0000sS-TY for qemu-devel@nongnu.org; Fri, 10 Jan 2020 01:07:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipnRr-0005dE-Bk for qemu-devel@nongnu.org; Fri, 10 Jan 2020 01:07:08 -0500 Received: from mail.ispras.ru ([83.149.199.45]:60068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ipnRr-0005Pn-2f; Fri, 10 Jan 2020 01:07:07 -0500 Received: from PASHAISP (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 09F69725C0; Fri, 10 Jan 2020 09:07:04 +0300 (MSK) From: "Pavel Dovgalyuk" To: "'Daniel Henrique Barboza'" , References: <20200106182425.20312-1-danielhb413@gmail.com> <20200106182425.20312-16-danielhb413@gmail.com> In-Reply-To: <20200106182425.20312-16-danielhb413@gmail.com> Subject: RE: [PATCH v1 15/59] block/blkreplay.c: remove unneeded 'fail' label in blkreplay_open() Date: Fri, 10 Jan 2020 09:07:04 +0300 Message-ID: <000a01d5c77c$2ebb5a00$8c320e00$@ru> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-Index: AdXEvqbie5zFYprPSzi9IdjgcpaudwCvXYoQ Content-Language: ru X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Received-From: 83.149.199.45 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: qemu-trivial@nongnu.org, 'Paolo Bonzini' , 'Pavel Dovgalyuk' Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" > From: Daniel Henrique Barboza [mailto:danielhb413@gmail.com] > Sent: Monday, January 06, 2020 9:24 PM > To: qemu-devel@nongnu.org > Cc: qemu-trivial@nongnu.org; Daniel Henrique Barboza; Pavel Dovgalyuk; Paolo Bonzini > Subject: [PATCH v1 15/59] block/blkreplay.c: remove unneeded 'fail' label in blkreplay_open() > > Both the 'fail' label and the 'ret' variable can be removed. > Use 'return -EINVAL' in the error condition and 'return 0' in > the end of the function. > > CC: Pavel Dovgalyuk > CC: Paolo Bonzini > Signed-off-by: Daniel Henrique Barboza Reviewed-by: Pavel Dovgalyuk > --- > block/blkreplay.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/block/blkreplay.c b/block/blkreplay.c > index c96ac8f4bc..d8c4c311f3 100644 > --- a/block/blkreplay.c > +++ b/block/blkreplay.c > @@ -24,23 +24,19 @@ static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags, > Error **errp) > { > Error *local_err = NULL; > - int ret; > > /* Open the image file */ > bs->file = bdrv_open_child(NULL, options, "image", > bs, &child_file, false, &local_err); > if (local_err) { > - ret = -EINVAL; > error_propagate(errp, local_err); > - goto fail; > + return -EINVAL; > } > > bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED; > bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED; > > - ret = 0; > -fail: > - return ret; > + return 0; > } > > static int64_t blkreplay_getlength(BlockDriverState *bs) > -- > 2.24.1 Pavel Dovgalyuk