[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/33] nbd: add errp parameter to nbd_wr_syncv()
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/33] nbd: add errp parameter to nbd_wr_syncv() |
Date: |
Thu, 1 Jun 2017 14:41:30 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Will be used in following patch to provide actual error message in
some cases.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 = nbd_send_request(s->ioc, request);
if (rc >= 0) {
ret = nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->len,
- false);
+ false, NULL);
if (ret != request->len) {
rc = -EIO;
}
@@ -165,7 +165,7 @@ static void nbd_co_receive_reply(NBDClientSession *s,
} else {
if (qiov && reply->error == 0) {
ret = nbd_wr_syncv(s->ioc, qiov->iov, qiov->niov, request->len,
- true);
+ true, NULL);
if (ret != request->len) {
reply->error = 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 *flags,
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 = 0;
- Error *local_err = NULL;
struct iovec *local_iov = g_new(struct iovec, niov);
struct iovec *local_iov_head = local_iov;
unsigned int nlocal_iov = niov;
@@ -41,19 +41,17 @@ ssize_t nbd_wr_syncv(QIOChannel *ioc,
while (nlocal_iov > 0) {
ssize_t len;
if (do_read) {
- len = qio_channel_readv(ioc, local_iov, nlocal_iov, &local_err);
+ len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);
} else {
- len = qio_channel_writev(ioc, local_iov, nlocal_iov, &local_err);
+ len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);
}
if (len == 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 = -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, void
*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);
}
/* read_sync
@@ -132,7 +132,7 @@ static inline int write_sync(QIOChannel *ioc, const void
*buffer, size_t size)
{
struct iovec iov = { .iov_base = (void *) buffer, .iov_len = size };
- ssize_t ret = nbd_wr_syncv(ioc, &iov, 1, size, false);
+ ssize_t ret = nbd_wr_syncv(ioc, &iov, 1, size, false, NULL);
assert(ret < 0 || ret == size);
--
1.8.3.1
- [Qemu-devel] [PULL 07/33] msix: trace control bit write op, (continued)
- [Qemu-devel] [PULL 07/33] msix: trace control bit write op, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 03/33] mc146818rtc: ensure LOST_TICK_POLICY_SLEW is only enabled on TARGET_I386, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 02/33] mc146818rtc: precisely count the clock for periodic timer, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 08/33] kvm: irqchip: skip update msi when disabled, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 09/33] Check the return value of fcntl in qemu_set_cloexec, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 05/33] mc146818rtc: embrace all x86 specific code, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 10/33] nbd: strict nbd_wr_syncv, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 06/33] kvm: irqchip: trace changes on msi add/remove, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 15/33] exec: simplify phys_page_find() params, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 14/33] nbd/client.c: use errp instead of LOG, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 12/33] nbd: add errp parameter to nbd_wr_syncv(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/33] nbd: add errp to read_sync, write_sync and drop_sync, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 16/33] virtio-scsi: Unset hotplug handler when unrealize, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 11/33] nbd: read_sync and friends: return 0 on success, Paolo Bonzini, 2017/06/01
- [Qemu-devel] [PULL 17/33] vhost-user-scsi: Introduce vhost-user-scsi host device, Paolo Bonzini, 2017/06/01
[Qemu-devel] [PULL 19/33] target/i386: enable A20 automatically in system management mode, Paolo Bonzini, 2017/06/01
[Qemu-devel] [PULL 18/33] vhost-user-scsi: Introduce a vhost-user-scsi sample application, Paolo Bonzini, 2017/06/01