From nobody Mon Feb 9 04:31:46 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; dkim=fail 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 1495193203469309.06850256615564; Fri, 19 May 2017 04:26:43 -0700 (PDT) Received: from localhost ([::1]:57952 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBg3N-0000Qd-S6 for importer@patchew.org; Fri, 19 May 2017 07:26:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dBfyO-0004Qk-KO for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dBfyN-0000y5-JS for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:32 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:36068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dBfyN-0000xk-A3 for qemu-devel@nongnu.org; Fri, 19 May 2017 07:21:31 -0400 Received: by mail-wm0-x22c.google.com with SMTP id 70so77499235wmq.1 for ; Fri, 19 May 2017 04:21:31 -0700 (PDT) Received: from 640k.lan (94-39-157-43.adsl-ull.clienti.tiscali.it. [94.39.157.43]) by smtp.gmail.com with ESMTPSA id v65sm2640095wmv.5.2017.05.19.04.21.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 May 2017 04:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/5AiP0aM3qct8OzdTV7PqSQeeDXpgUAaU1BRwwc8rqs=; b=t8NxWJqb+4eCEVve/Z9ozty3p0D5jEmhkn1fWPEJTT11Bxx36wzOxNvJUJsMOPt4K4 2vLdM3xpc4bwzer81HK74a2b73xpRUbyg3PlpoGDMRoUNVdgWpH6anyouF8wqE2wXSK3 HhmXKU49wpPGRNxt4ElNL+1w3+6O+4fE9/YEvbIy9SVXa6HIjBAP10JeEok3hkiBZN8e IB1QpoRMb+WwtToqGgkDqJItCLWm2mZZVq0mW+H1WayS3EijVGdRVyfl/zYW61jUMaQ2 +5Y7Ze/I5n/cxBUlscJE2CAe1zt94QVt9bfUGzmrFUfND91LkCtb6CVct8XYGlMJidwg lgNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/5AiP0aM3qct8OzdTV7PqSQeeDXpgUAaU1BRwwc8rqs=; b=sfW6JIbmIXu2U+vCEVIq4UjrZXv2HeCaLhFdCJSMmKj8dMOlFW1I2DFB9k+Mzr6tEC uKYFfsEhDHa1YQDdpWP1VjzMnBOzzU6E8YE6BeXJkmCSw4l9m2MKnKJL3PnD9uXyjLzU L1tIfdRCmDUbE7DFoMn0pW3PpNJ9gDgSpr3OlQ7UTLS5yZgIyfXb6tgYOrjJSvb+U7c7 ktt/cZy93kKyMRYaeNhtIaAE2veaCPRpfEGc8ZY22uD+ZCZ8T8KqmqC1Y4u4RvGGjODX v4fo5ODDPFZvvVBj1uRUYx+jh8Z5cpyEEJuzM6BQYO/zw1CTx7g60Ao/RmfcivfBZxOK ORaA== X-Gm-Message-State: AODbwcD74WHTCl8fdtteIKrCBwXIDyDRgVxMukGWjZABfqwDOapIV0Ju a+lHKCMgLgTYAQ== X-Received: by 10.28.126.210 with SMTP id z201mr5926122wmc.75.1495192890109; Fri, 19 May 2017 04:21:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 May 2017 13:21:04 +0200 Message-Id: <1495192872-27667-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1495192872-27667-1-git-send-email-pbonzini@redhat.com> References: <1495192872-27667-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 12/20] nbd: add errp parameter to nbd_wr_syncv() 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: Vladimir Sementsov-Ogievskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Will be used in following patch to provide actual error message in some cases. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20170516094533.6160-4-vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- block/nbd-client.c | 4 ++-- include/block/nbd.h | 3 ++- nbd/common.c | 12 +++++------- nbd/nbd-internal.h | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/block/nbd-client.c b/block/nbd-client.c index 1e2952f..538d95e 100644 --- a/block/nbd-client.c +++ b/block/nbd-client.c @@ -136,7 +136,7 @@ static int nbd_co_send_request(BlockDriverState *bs, rc =3D nbd_send_request(s->ioc, request); if (rc >=3D 0) { ret =3D nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->l= en, - false); + false, NULL); if (ret !=3D request->len) { rc =3D -EIO; } @@ -165,7 +165,7 @@ static void nbd_co_receive_reply(NBDClientSession *s, } else { if (qiov && reply->error =3D=3D 0) { ret =3D nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->l= en, - true); + true, NULL); if (ret !=3D request->len) { reply->error =3D EIO; } diff --git a/include/block/nbd.h b/include/block/nbd.h index 0ed0775..9d385ea 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -127,7 +127,8 @@ ssize_t nbd_wr_syncv(QIOChannel *ioc, struct iovec *iov, size_t niov, size_t length, - bool do_read); + bool do_read, + Error **errp); int nbd_receive_negotiate(QIOChannel *ioc, const char *name, uint16_t *fla= gs, QCryptoTLSCreds *tlscreds, const char *hostname, QIOChannel **outioc, diff --git a/nbd/common.c b/nbd/common.c index 4db45b3..bd81637 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -28,10 +28,10 @@ ssize_t nbd_wr_syncv(QIOChannel *ioc, struct iovec *iov, size_t niov, size_t length, - bool do_read) + bool do_read, + Error **errp) { ssize_t done =3D 0; - Error *local_err =3D NULL; struct iovec *local_iov =3D g_new(struct iovec, niov); struct iovec *local_iov_head =3D local_iov; unsigned int nlocal_iov =3D niov; @@ -41,19 +41,17 @@ ssize_t nbd_wr_syncv(QIOChannel *ioc, while (nlocal_iov > 0) { ssize_t len; if (do_read) { - len =3D qio_channel_readv(ioc, local_iov, nlocal_iov, &local_e= rr); + len =3D qio_channel_readv(ioc, local_iov, nlocal_iov, errp); } else { - len =3D qio_channel_writev(ioc, local_iov, nlocal_iov, &local_= err); + len =3D qio_channel_writev(ioc, local_iov, nlocal_iov, errp); } if (len =3D=3D QIO_CHANNEL_ERR_BLOCK) { + /* errp should not be set */ assert(qemu_in_coroutine()); qio_channel_yield(ioc, do_read ? G_IO_IN : G_IO_OUT); continue; } if (len < 0) { - TRACE("I/O error: %s", error_get_pretty(local_err)); - error_free(local_err); - /* XXX handle Error objects */ done =3D -EIO; goto cleanup; } diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index e6bbc7c..1d479fe 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -108,7 +108,7 @@ static inline ssize_t read_sync_eof(QIOChannel *ioc, vo= id *buffer, size_t size) * our request/reply. Synchronization is done with recv_coroutine, so * that this is coroutine-safe. */ - return nbd_wr_syncv(ioc, &iov, 1, size, true); + return nbd_wr_syncv(ioc, &iov, 1, size, true, NULL); } =20 /* read_sync @@ -132,7 +132,7 @@ static inline int write_sync(QIOChannel *ioc, const voi= d *buffer, size_t size) { struct iovec iov =3D { .iov_base =3D (void *) buffer, .iov_len =3D siz= e }; =20 - ssize_t ret =3D nbd_wr_syncv(ioc, &iov, 1, size, false); + ssize_t ret =3D nbd_wr_syncv(ioc, &iov, 1, size, false, NULL); =20 assert(ret < 0 || ret =3D=3D size); =20 --=20 1.8.3.1