From nobody Sun Feb 8 05:08:41 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578337418; cv=none; d=zohomail.com; s=zohoarc; b=HX3VR64Nh4VbpETsA1WF/A/CPY+03DvthHdplKVjky5Nojdt4S/ZPT3tuoytAx1oZmzekFwhI+8qDw3hPmDb+/jp4zXcaZRODcUrrlMIMk2TnDR/cWFZkSSxe78DvQzfr0Pq8HHK+2SecyLVQmVPIJ0nvu9BSRzF51I5DHwZzpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578337418; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PKYZ0M4t+5Cvodu2K02JYtC//F3gaNkUYi3Ckm33kDw=; b=dDEUaTpRKUSkokrdfRBlZYgeR+cWbqeWS/Q3MEnVLVjOfKdq+gEHTNttJTLZszWQprMvDQY+2NaYBScIBL2tl8d0AaZoup8Nrktb6gKAUw4bCd2j8/BRvwu41suXwXhWbq5zk3IsCM5r6k7llIisK1C0gJQXow4VNsBTcGckflQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578337418709613.0170823805234; Mon, 6 Jan 2020 11:03:38 -0800 (PST) Received: from localhost ([::1]:58272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioXf7-0000IG-9g for importer@patchew.org; Mon, 06 Jan 2020 14:03:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45679) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioX4M-0002NS-QF for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioX4L-0004PA-PU for qemu-devel@nongnu.org; Mon, 06 Jan 2020 13:25:38 -0500 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]:38121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ioX4L-0004On-LO; Mon, 06 Jan 2020 13:25:37 -0500 Received: by mail-qk1-x744.google.com with SMTP id k6so40296963qki.5; Mon, 06 Jan 2020 10:25:37 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:655b:9e1c:e865:3705:e1df]) by smtp.gmail.com with ESMTPSA id b81sm21026522qkc.135.2020.01.06.10.25.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2020 10:25:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PKYZ0M4t+5Cvodu2K02JYtC//F3gaNkUYi3Ckm33kDw=; b=vgvSkeeOFCOWiENjxBXP+qbzb6eNuk+3D7Q6fYet0qFgaDfGM9sD3FyHyi0t9i1AG0 qIXDU0dBHuKSA/RNyWMbNviS/3e89GH3uuyyOdGfeXccgCOinZL0AGDFQBSphX4HGbGn Xk+HHkS6Ygvyh0HqGzXRXQuF+FXxIGmj4K4MfehzTYK2QTd8irx2suv00wTl7FLpS39o vZzgvBWStF6P1AOrGBuUwpOxzfC0+ZiUkccB3n4ys+laWqT1ysKC1Qjgab5cHQmR0wLx yChLWGqTvsMlgZK9NZdjuLMbBr+DSBNM69R0tw27GUqI4rLZLiBWf+Kuq3PPfBPczZj4 kLAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PKYZ0M4t+5Cvodu2K02JYtC//F3gaNkUYi3Ckm33kDw=; b=q9WFH9HUN+1Inu5WMOnhE9Kyqf6fDclwku5hGQ1wwYcmkXjDuAVUG0/OeVh12Mb3eo TLqVu0v9jnlGwMFj9ayFaqw/CBuF0/IWLrZ8+7So+iOgimHZOuC4aAep99U60sYH3CWT /Mkp3MDzwuSfY0HnwD6Wf4blVnB3fmcD+xrKsjApsORVk1GUnDD+MxB3Jh74CILtb1Nl T1saOzY2QlT1PikIwU8NmgjuGaqRlYixXSHNjdXByMU0qzc5cRt8BckGA6iSQQYlr3F3 6+tMIduUNm5UyFGmcAjP3MLKirz7uqq/YSf4Db84H/Td//Gh/8bimHo3GdbRGohrOAWB y0qg== X-Gm-Message-State: APjAAAVUKCi3esE/HH2ZCxzUpGb1RLhUMHiIcMJq6I/agL7K2VYXjJGa 7GdGTB9D9wi7fC83WZCdajSoCuzN X-Google-Smtp-Source: APXvYqyHPrK96/xFK20pSP76AtA0O9Douwyua786EZfCF4dVv9Ptbi5dJPEGq9kPIygFyrbrybdiSA== X-Received: by 2002:a37:9f41:: with SMTP id i62mr81732449qke.272.1578335137004; Mon, 06 Jan 2020 10:25:37 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Subject: [PATCH v1 25/59] block/vhdx.c: remove unneeded 'exit' labels Date: Mon, 6 Jan 2020 15:23:51 -0300 Message-Id: <20200106182425.20312-26-danielhb413@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200106182425.20312-1-danielhb413@gmail.com> References: <20200106182425.20312-1-danielhb413@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::744 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, Jeff Cody , Daniel Henrique Barboza , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 'exit' label of vhdx_region_check() and vhdx_update_header() can be replaced by 'return' statements. CC: Jeff Cody CC: qemu-block@nongnu.org Signed-off-by: Daniel Henrique Barboza --- block/vhdx.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/block/vhdx.c b/block/vhdx.c index f02d2611be..7a1ea312ed 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -229,7 +229,6 @@ void vhdx_guid_generate(MSGUID *guid) /* Check for region overlaps inside the VHDX image */ static int vhdx_region_check(BDRVVHDXState *s, uint64_t start, uint64_t le= ngth) { - int ret =3D 0; uint64_t end; VHDXRegionEntry *r; =20 @@ -239,13 +238,11 @@ static int vhdx_region_check(BDRVVHDXState *s, uint64= _t start, uint64_t length) error_report("VHDX region %" PRIu64 "-%" PRIu64 " overlaps wit= h " "region %" PRIu64 "-%." PRIu64, start, end, r->st= art, r->end); - ret =3D -EINVAL; - goto exit; + return -EINVAL; } } =20 -exit: - return ret; + return 0; } =20 /* Register a region for future checks */ @@ -390,11 +387,10 @@ static int vhdx_update_header(BlockDriverState *bs, B= DRVVHDXState *s, =20 ret =3D vhdx_write_header(bs->file, inactive_header, header_offset, tr= ue); if (ret < 0) { - goto exit; + return ret; } s->curr_header =3D hdr_idx; =20 -exit: return ret; } =20 --=20 2.24.1