From nobody Tue Feb 10 21:19:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498059679313581.1602372981125; Wed, 21 Jun 2017 08:41:19 -0700 (PDT) Received: from localhost ([::1]:54728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNhkq-00057g-Lc for importer@patchew.org; Wed, 21 Jun 2017 11:41:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNheN-0007vj-H4 for qemu-devel@nongnu.org; Wed, 21 Jun 2017 11:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNheI-0008Qa-GN for qemu-devel@nongnu.org; Wed, 21 Jun 2017 11:34:35 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:43174 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dNheI-0008Ow-4Y for qemu-devel@nongnu.org; Wed, 21 Jun 2017 11:34:30 -0400 Received: from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v5LFYOHh025147; Wed, 21 Jun 2017 18:34:24 +0300 (MSK) From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org Date: Wed, 21 Jun 2017 18:34:21 +0300 Message-Id: <20170621153424.16690-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170621153424.16690-1-vsementsov@virtuozzo.com> References: <20170621153424.16690-1-vsementsov@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 3/6] nbd/server: add errp to nbd_send_reply() 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: pbonzini@redhat.com, vsementsov@virtuozzo.com, stefanha@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- nbd/server.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/nbd/server.c b/nbd/server.c index fa493602dd..0671ebc50a 100644 --- a/nbd/server.c +++ b/nbd/server.c @@ -693,7 +693,7 @@ static int nbd_receive_request(QIOChannel *ioc, NBDRequ= est *request, return 0; } =20 -static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply) +static int nbd_send_reply(QIOChannel *ioc, NBDReply *reply, Error **errp) { uint8_t buf[NBD_REPLY_SIZE]; =20 @@ -712,7 +712,7 @@ static int nbd_send_reply(QIOChannel *ioc, NBDReply *re= ply) stl_be_p(buf + 4, reply->error); stq_be_p(buf + 8, reply->handle); =20 - return nbd_write(ioc, buf, sizeof(buf), NULL); + return nbd_write(ioc, buf, sizeof(buf), errp); } =20 #define MAX_NBD_REQUESTS 16 @@ -999,7 +999,8 @@ void nbd_export_close_all(void) } } =20 -static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len) +static int nbd_co_send_reply(NBDRequestData *req, NBDReply *reply, int len, + Error **errp) { NBDClient *client =3D req->client; int ret; @@ -1009,12 +1010,12 @@ static int nbd_co_send_reply(NBDRequestData *req, N= BDReply *reply, int len) client->send_coroutine =3D qemu_coroutine_self(); =20 if (!len) { - ret =3D nbd_send_reply(client->ioc, reply); + ret =3D nbd_send_reply(client->ioc, reply, errp); } else { qio_channel_set_cork(client->ioc, true); - ret =3D nbd_send_reply(client->ioc, reply); + ret =3D nbd_send_reply(client->ioc, reply, errp); if (ret =3D=3D 0) { - ret =3D nbd_write(client->ioc, req->data, len, NULL); + ret =3D nbd_write(client->ioc, req->data, len, errp); if (ret < 0) { ret =3D -EIO; } @@ -1266,8 +1267,8 @@ reply: local_err =3D NULL; } =20 - if (nbd_co_send_reply(req, &reply, reply_data_len) < 0) { - error_setg(&local_err, "Failed to send reply"); + if (nbd_co_send_reply(req, &reply, reply_data_len, &local_err) < 0) { + error_prepend(&local_err, "Failed to send reply: "); goto disconnect; } =20 --=20 2.11.1