From nobody Mon Nov 10 06:19:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1559152723; cv=none; d=zoho.com; s=zohoarc; b=XdWb2uVVGir6T9FS53nasDKtzVdJvLo9zTNtVbMnZjHXjx8ul1vcKo+Z3oVL6RAmL+A7ah14btm/0PYtg3D/WY7/An5dL8GtOtOZ9VAFRjQJXKH543hm4k/RGnQ2zOTyVOCRY/CWd5zhtuo2pMunoWJ834hmD+M8E0yIEJSwQns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559152723; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gwYJ2xIVtdYextQWy7IlHj9QleZphF7OyGA7435ZgVE=; b=efmTLS2+3/9c6G3SjAinPbnBeG0PrDeo/0r2ZY4eP8FJhY8mqbonGYQqZn6eBquDBRObvQXaxce9aYmcP79Gvf/hatH8W5QMBfZowBa2W++rhirydZjndFyA08i1Jq6lkxnGwM5AYjnX+FZcKccu7DW8XpWuHle6auM6rvajsO8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559152723321140.6498554402051; Wed, 29 May 2019 10:58:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:58673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW2pz-0005d3-8M for importer@patchew.org; Wed, 29 May 2019 13:58:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hW2oL-0004Va-2Y for qemu-devel@nongnu.org; Wed, 29 May 2019 13:56:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hW2oK-00073T-63 for qemu-devel@nongnu.org; Wed, 29 May 2019 13:56:25 -0400 Received: from relay.sw.ru ([185.231.240.75]:48116) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hW2oJ-00072O-U7; Wed, 29 May 2019 13:56:24 -0400 Received: from [172.16.25.136] (helo=localhost.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1hW2oD-0006Rz-Sz; Wed, 29 May 2019 20:56:17 +0300 From: Andrey Shinkevich To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Wed, 29 May 2019 20:56:15 +0300 Message-Id: <1559152576-281803-3-git-send-email-andrey.shinkevich@virtuozzo.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1559152576-281803-1-git-send-email-andrey.shinkevich@virtuozzo.com> References: <1559152576-281803-1-git-send-email-andrey.shinkevich@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v7 2/3] block/stream: refactor stream_run: drop goto X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, fam@euphon.net, vsementsov@virtuozzo.com, berto@igalia.com, wencongyang2@huawei.com, xiechanglong.d@gmail.com, mreitz@redhat.com, stefanha@redhat.com, andrey.shinkevich@virtuozzo.com, den@openvz.org, jsnow@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The goto is unnecessary in the stream_run() since the common exit code was removed in the commit eb23654dbe43b549ea2a9ebff9d8e: "jobs: utilize job_exit shim". Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Andrey Shinkevich Reviewed-by: Alberto Garcia Reviewed-by: Max Reitz --- block/stream.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/block/stream.c b/block/stream.c index 97fddb2..65b13b2 100644 --- a/block/stream.c +++ b/block/stream.c @@ -120,13 +120,12 @@ static int coroutine_fn stream_run(Job *job, Error **= errp) void *buf; =20 if (!bs->backing) { - goto out; + return 0; } =20 len =3D bdrv_getlength(bs); if (len < 0) { - ret =3D len; - goto out; + return len; } job_progress_set_remaining(&s->common.job, len); =20 @@ -203,14 +202,10 @@ static int coroutine_fn stream_run(Job *job, Error **= errp) bdrv_disable_copy_on_read(bs); } =20 - /* Do not remove the backing file if an error was there but ignored. = */ - ret =3D error; - qemu_vfree(buf); =20 -out: - /* Modify backing chain and close BDSes in main loop */ - return ret; + /* Do not remove the backing file if an error was there but ignored. */ + return error; } =20 static const BlockJobDriver stream_job_driver =3D { --=20 1.8.3.1