From nobody Thu May 2 19:49:55 2024 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; 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=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1574882109; cv=none; d=zohomail.com; s=zohoarc; b=QBUtueb1Jz/Uq6Pb+piUWbC8qLdqSnwTPuzox8xVsGZpsvEt/w+qYwXy9pPE3wXELUjdwvKHBljGBgpnqoioDi6R3VqEjH1SnQXN9yykmowR/p4RZQYQi8nMHfQ4m3GN/bY3SRYOAXLk3KcZ3NxDC0uiZu800hTMmZSTl0sNSGo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574882109; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=eegxHGgAlg/yHedivRHbyL9zKniwVOwNxBYS/gcA3xM=; b=fYXmNb5RCK2lDnEDXiqLfU7H2Kif0n1byuV4crQ4Wsz6t8exr2oNII4AS6sNBHPHGEmULBmAUx5svksOLL8R2dkDK+3/Ea49D3FU1/5X9UyPFJ3pdrZZwQcdY7kRdzaaO/ihuDReU4OyB/vZidIRovPt4sNz3vAl+pZ/N+7o5oI= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 1574882109335425.4234001677688; Wed, 27 Nov 2019 11:15:09 -0800 (PST) Received: from localhost ([::1]:42080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2mJ-0007mp-Bh for importer@patchew.org; Wed, 27 Nov 2019 14:15:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60683) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia2lA-0007L2-Jn for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:13:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia2l8-00023b-TG for qemu-devel@nongnu.org; Wed, 27 Nov 2019 14:13:55 -0500 Received: from relay.sw.ru ([185.231.240.75]:53078) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ia2gA-0005fi-Ht; Wed, 27 Nov 2019 14:08:46 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1ia2g6-0003cF-4S; Wed, 27 Nov 2019 22:08:42 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH v6] nbd: well form nbd_iter_channel_error errp handler Date: Wed, 27 Nov 2019 22:08:40 +0300 Message-Id: <20191127190840.15773-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 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: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Make nbd_iter_channel_error errp handler well formed: rename local_err to errp_in, as it is IN-parameter here (which is unusual for Error**). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- v6: fix commit message add Eric's r-b block/nbd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 5f18f78a94..345bf902e3 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -864,18 +864,18 @@ typedef struct NBDReplyChunkIter { } NBDReplyChunkIter; =20 static void nbd_iter_channel_error(NBDReplyChunkIter *iter, - int ret, Error **local_err) + int ret, Error **errp_in) { - assert(ret < 0); + assert(ret < 0 && errp_in && *errp_in); =20 if (!iter->ret) { iter->ret =3D ret; - error_propagate(&iter->err, *local_err); + error_propagate(&iter->err, *errp_in); } else { - error_free(*local_err); + error_free(*errp_in); } =20 - *local_err =3D NULL; + *errp_in =3D NULL; } =20 static void nbd_iter_request_error(NBDReplyChunkIter *iter, int ret) --=20 2.21.0