[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/26] nbd: fix error handling in the server
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/26] nbd: fix error handling in the server |
Date: |
Fri, 23 Dec 2011 16:26:10 +0100 |
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 ff701d3..5b718b5 100644
--- a/nbd.c
+++ b/nbd.c
@@ -595,6 +595,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.");
@@ -633,12 +634,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;
@@ -681,11 +683,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.7.1
- [Qemu-devel] [PULL 00/26] nbd refactoring, fully asynchronous operation, flushing, fixes, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 01/26] add qemu_send_full and qemu_recv_full, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 02/26] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 03/26] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 04/26] nbd: split requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 08/26] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 06/26] nbd: fix error handling in the server,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/26] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 10/26] Update ioctl order in nbd_init() to detect EBUSY, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 12/26] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 13/26] move corking functions to osdep.c, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 14/26] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 15/26] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 16/26] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 19/26] qemu-nbd: introduce NBDRequest, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 20/26] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/12/23
- [Qemu-devel] [PATCH 22/26] qemu-nbd: move client handling to nbd.c, Paolo Bonzini, 2011/12/23