[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/9] sheepdog: check return values of qemu_co_rec
From: |
MORITA Kazutaka |
Subject: |
[Qemu-devel] [PATCH v2 3/9] sheepdog: check return values of qemu_co_recv/send correctly |
Date: |
Wed, 24 Jul 2013 16:56:27 +0900 |
qemu_co_recv/send return shorter length on error.
Signed-off-by: MORITA Kazutaka <address@hidden>
---
block/sheepdog.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 6a41ad9..bca5730 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -671,7 +671,7 @@ static void coroutine_fn aio_read_response(void *opaque)
/* read a header */
ret = qemu_co_recv(fd, &rsp, sizeof(rsp));
- if (ret < 0) {
+ if (ret < sizeof(rsp)) {
error_report("failed to get the header, %s", strerror(errno));
goto out;
}
@@ -722,7 +722,7 @@ static void coroutine_fn aio_read_response(void *opaque)
case AIOCB_READ_UDATA:
ret = qemu_co_recvv(fd, acb->qiov->iov, acb->qiov->niov,
aio_req->iov_offset, rsp.data_length);
- if (ret < 0) {
+ if (ret < rsp.data_length) {
error_report("failed to get the data, %s", strerror(errno));
goto out;
}
@@ -1075,7 +1075,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
/* send a header */
ret = qemu_co_send(s->fd, &hdr, sizeof(hdr));
- if (ret < 0) {
+ if (ret < sizeof(hdr)) {
qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a req, %s", strerror(errno));
return -errno;
@@ -1083,7 +1083,7 @@ static int coroutine_fn add_aio_request(BDRVSheepdogState
*s, AIOReq *aio_req,
if (wlen) {
ret = qemu_co_sendv(s->fd, iov, niov, aio_req->iov_offset, wlen);
- if (ret < 0) {
+ if (ret < wlen) {
qemu_co_mutex_unlock(&s->lock);
error_report("failed to send a data, %s", strerror(errno));
return -errno;
--
1.8.1.3.566.gaa39828
- [Qemu-devel] [PATCH v2 0/9] sheepdog: reconnect server after connection failure, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 4/9] sheepdog: handle vdi objects in resend_aio_req, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 2/9] iov: handle EOF in iov_send_recv, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 1/9] ignore SIGPIPE in qemu-img and qemu-io, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 3/9] sheepdog: check return values of qemu_co_recv/send correctly,
MORITA Kazutaka <=
- [Qemu-devel] [PATCH v2 7/9] sheepdog: try to reconnect to sheepdog after network error, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 5/9] sheepdog: reload inode outside of resend_aioreq, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 6/9] coroutine: add co_aio_sleep_ns() to allow sleep in block drivers, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 8/9] sheepdog: make add_aio_request and send_aioreq void functions, MORITA Kazutaka, 2013/07/24
- [Qemu-devel] [PATCH v2 9/9] sheepdog: cancel aio requests if possible, MORITA Kazutaka, 2013/07/24
- Re: [Qemu-devel] [sheepdog] [PATCH v2 0/9] sheepdog: reconnect server after connection failure, Liu Yuan, 2013/07/24