[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/15] qemu-nbd: simplify nbd_trip
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/15] qemu-nbd: simplify nbd_trip |
Date: |
Mon, 10 Oct 2011 11:37:46 +0200 |
Use TCP_CORK to remove a violation of encapsulation, that would later
require nbd_trip to know too much about an NBD reply.
We could also switch to sendmsg (qemu_co_sendv) later, it is even
easier once coroutines are in.
Signed-off-by: Paolo Bonzini <address@hidden>
---
nbd.c | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/nbd.c b/nbd.c
index 59c47ee..252fa7c 100644
--- a/nbd.c
+++ b/nbd.c
@@ -598,9 +598,9 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
if (nbd_receive_request(csock, &request) == -1)
return -1;
- if (request.len + NBD_REPLY_SIZE > NBD_BUFFER_SIZE) {
+ if (request.len > NBD_BUFFER_SIZE) {
LOG("len (%u) is larger than max len (%u)",
- request.len + NBD_REPLY_SIZE, NBD_BUFFER_SIZE);
+ request.len, NBD_BUFFER_SIZE);
errno = EINVAL;
return -1;
}
@@ -631,8 +631,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
TRACE("Request type is READ");
ret = bdrv_read(bs, (request.from + dev_offset) / 512,
- data + NBD_REPLY_SIZE,
- request.len / 512);
+ data, request.len / 512);
if (ret < 0) {
LOG("reading from file failed");
reply.error = -ret;
@@ -640,26 +639,18 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size,
}
TRACE("Read %u byte(s)", request.len);
-
- /* Reply
- [ 0 .. 3] magic (NBD_REPLY_MAGIC)
- [ 4 .. 7] error (0 == no error)
- [ 7 .. 15] handle
- */
-
- cpu_to_be32w((uint32_t*)data, NBD_REPLY_MAGIC);
- cpu_to_be32w((uint32_t*)(data + 4), reply.error);
- cpu_to_be64w((uint64_t*)(data + 8), reply.handle);
+ socket_set_cork(csock, 1);
+ if (nbd_send_reply(csock, &reply) == -1)
+ return -1;
TRACE("Sending data to client");
- if (write_sync(csock, data,
- request.len + NBD_REPLY_SIZE) !=
- request.len + NBD_REPLY_SIZE) {
+ if (write_sync(csock, data, request.len) != request.len) {
LOG("writing to socket failed");
errno = EINVAL;
return -1;
}
+ socket_set_cork(csock, 0);
break;
case NBD_CMD_WRITE:
TRACE("Request type is WRITE");
--
1.7.6
- [Qemu-devel] [PATCH 00/15] NBD server improvements, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 01/15] qemu-nbd: remove offset argument to nbd_trip, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 02/15] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 03/15] move corking functions to osdep.c, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 04/15] qemu-nbd: simplify nbd_trip,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/15] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 11/15] qemu-nbd: use common main loop, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 07/15] qemu-nbd: introduce nbd_do_receive_request, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 14/15] qemu-nbd: asynchronous operation, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 08/15] qemu-nbd: introduce NBDExport, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 05/15] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 12/15] qemu-nbd: move client handling to nbd.c, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 10/15] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 13/15] qemu-nbd: add client pointer to NBDRequest, Paolo Bonzini, 2011/10/10
- [Qemu-devel] [PATCH 09/15] qemu-nbd: introduce NBDRequest, Paolo Bonzini, 2011/10/10