diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2011-09-13 17:27:45 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2011-12-22 11:53:57 +0100 |
commit | adcf6302de40e50a8010e7f2c79b3dac2eea6e0c (patch) | |
tree | 6353b8ff522deca3fe083ed9992f27b75492b7eb /nbd.c | |
parent | ecda3447d18637c48469296c4ca8823f0a5c6717 (diff) | |
download | hqemu-adcf6302de40e50a8010e7f2c79b3dac2eea6e0c.zip hqemu-adcf6302de40e50a8010e7f2c79b3dac2eea6e0c.tar.gz |
nbd: fix error handling in the server
bdrv_read and bdrv_write return negative errno values, not -1.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'nbd.c')
-rw-r--r-- | nbd.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -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; |