[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 09/15] nbd: fix error handling in the server
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 09/15] nbd: fix error handling in the server |
Date: |
Wed, 5 Oct 2011 09:17:39 +0200 |
bdrv_read and bdrv_write return negative errno values, not -1.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/nbd.c b/nbd.c
index fb5e424..5df9745 100644
--- a/nbd.c
+++ b/nbd.c
@@ -580,6 +580,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset,
{
struct nbd_request request;
struct nbd_reply reply;
+ int ret;
TRACE("Reading request.");
@@ -618,12 +619,13 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset,
case NBD_CMD_READ:
TRACE("Request type is READ");
- if (bdrv_read(bs, (request.from + dev_offset) / 512,
- data + NBD_REPLY_SIZE,
- request.len / 512) == -1) {
+ ret = bdrv_read(bs, (request.from + dev_offset) / 512,
+ data + NBD_REPLY_SIZE,
+ request.len / 512);
+ if (ret < 0) {
LOG("reading from file failed");
- errno = EINVAL;
- return -1;
+ reply.error = -ret;
+ request.len = 0;
}
*offset += request.len;
@@ -666,11 +668,12 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
uint64_t dev_offset,
} else {
TRACE("Writing to device");
- if (bdrv_write(bs, (request.from + dev_offset) / 512,
- data, request.len / 512) == -1) {
+ ret = bdrv_write(bs, (request.from + dev_offset) / 512,
+ data, request.len / 512);
+ if (ret < 0) {
LOG("writing to file failed");
- errno = EINVAL;
- return -1;
+ reply.error = -ret;
+ request.len = 0;
}
*offset += request.len;
--
1.7.6
- [Qemu-devel] [PATCH v3 01/15] sheepdog: add coroutine_fn markers, (continued)
- [Qemu-devel] [PATCH v3 05/15] block: emulate .bdrv_flush() using .bdrv_aio_flush(), Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 06/15] block: group together the plugging of synchronous IO emulation, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 08/15] block: add bdrv_co_discard and bdrv_aio_discard support, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 07/15] block: add bdrv_co_flush support, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 09/15] nbd: fix error handling in the server,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 11/15] nbd: add support for NBD_CMD_FLAG_FUA, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 10/15] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 12/15] nbd: add support for NBD_CMD_TRIM, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 14/15] nbd: split requests, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 04/15] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 13/15] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/10/05
- [Qemu-devel] [PATCH v3 15/15] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/10/05
- Re: [Qemu-devel] [PATCH v3 00/15] NBD improvements, Paolo Bonzini, 2011/10/13