From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54979) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwx7-0002mg-Jo for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:29:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXwx3-0000ZM-DZ for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:29:05 -0500 Received: from mail-ey0-f173.google.com ([209.85.215.173]:55812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwx3-0000FN-7S for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:29:01 -0500 Received: by mail-ey0-f173.google.com with SMTP id i10so5955043eaa.4 for ; Tue, 06 Dec 2011 07:29:00 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 6 Dec 2011 16:27:42 +0100 Message-Id: <1323185272-2610-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> References: <1323185272-2610-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 15/25] qemu-nbd: introduce nbd_do_send_reply List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Group the sending of a reply and the associated data into a new function. Without corking, the caller would be forced to leave 12 free bytes at the beginning of the data pointer. Not too ugly, but still ugly. :) Using nbd_do_send_reply everywhere will help when the routine will set up the write handler that re-enters the send coroutine. Signed-off-by: Paolo Bonzini --- nbd.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/nbd.c b/nbd.c index 71447cd..fb074ef 100644 --- a/nbd.c +++ b/nbd.c @@ -583,6 +583,34 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply) return 0; } +static int nbd_do_send_reply(int csock, struct nbd_reply *reply, + uint8_t *data, int len) +{ + int rc, ret; + + if (!len) { + rc = nbd_send_reply(csock, reply); + if (rc == -1) { + rc = -errno; + } + } else { + socket_set_cork(csock, 1); + rc = nbd_send_reply(csock, reply); + if (rc != -1) { + ret = write_sync(csock, data, len); + if (ret != len) { + errno = EIO; + rc = -1; + } + } + if (rc == -1) { + rc = -errno; + } + socket_set_cork(csock, 0); + } + return rc; +} + int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, uint32_t nbdflags, uint8_t *data) @@ -637,18 +665,8 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, } TRACE("Read %u byte(s)", request.len); - socket_set_cork(csock, 1); - if (nbd_send_reply(csock, &reply) == -1) + if (nbd_do_send_reply(csock, &reply, data, request.len) < 0) return -1; - - TRACE("Sending data to client"); - - 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"); @@ -684,7 +702,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, } } - if (nbd_send_reply(csock, &reply) == -1) + if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0) return -1; break; case NBD_CMD_DISC: @@ -700,7 +718,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, reply.error = -ret; } - if (nbd_send_reply(csock, &reply) == -1) + if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0) return -1; break; case NBD_CMD_TRIM: @@ -711,7 +729,7 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, LOG("discard failed"); reply.error = -ret; } - if (nbd_send_reply(csock, &reply) == -1) + if (nbd_do_send_reply(csock, &reply, NULL, 0) < 0) return -1; break; default: -- 1.7.7.1