From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54874) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwww-00027b-Fc for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:29:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXwwu-0000Nv-Rk for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:54 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:40617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwu-0000A8-OS for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:52 -0500 Received: by mail-iy0-f173.google.com with SMTP id j26so193361iaf.4 for ; Tue, 06 Dec 2011 07:28:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 6 Dec 2011 16:27:39 +0100 Message-Id: <1323185272-2610-13-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 12/25] qemu-nbd: remove data_size argument to nbd_trip List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The size of the buffer is in practice part of the protocol. Signed-off-by: Paolo Bonzini --- nbd.c | 6 +++--- nbd.h | 4 +++- qemu-nbd.c | 4 +--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nbd.c b/nbd.c index f93a927..2380960 100644 --- a/nbd.c +++ b/nbd.c @@ -585,7 +585,7 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply) int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, uint32_t nbdflags, - uint8_t *data, int data_size) + uint8_t *data) { struct nbd_request request; struct nbd_reply reply; @@ -596,9 +596,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 > data_size) { + if (request.len + NBD_REPLY_SIZE > NBD_BUFFER_SIZE) { LOG("len (%u) is larger than max len (%u)", - request.len + NBD_REPLY_SIZE, data_size); + request.len + NBD_REPLY_SIZE, NBD_BUFFER_SIZE); errno = EINVAL; return -1; } diff --git a/nbd.h b/nbd.h index ebdb2db..dbc4c0d 100644 --- a/nbd.h +++ b/nbd.h @@ -57,6 +57,8 @@ enum { #define NBD_DEFAULT_PORT 10809 +#define NBD_BUFFER_SIZE (1024*1024) + size_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read); int tcp_socket_outgoing(const char *address, uint16_t port); int tcp_socket_incoming(const char *address, uint16_t port); @@ -72,7 +74,7 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize); int nbd_send_request(int csock, struct nbd_request *request); int nbd_receive_reply(int csock, struct nbd_reply *reply); int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - uint32_t nbdflags, uint8_t *data, int data_size); + uint32_t nbdflags, uint8_t *data); int nbd_client(int fd); int nbd_disconnect(int fd); diff --git a/qemu-nbd.c b/qemu-nbd.c index f9ee9c5..d662268 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -35,8 +35,6 @@ #define SOCKET_PATH "/var/lock/qemu-nbd-%s" -#define NBD_BUFFER_SIZE (1024*1024) - static int sigterm_wfd; static int verbose; static char *device; @@ -541,7 +539,7 @@ int main(int argc, char **argv) for (i = 1; i < nb_fds && ret; i++) { if (FD_ISSET(sharing_fds[i], &fds)) { if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset, - nbdflags, data, NBD_BUFFER_SIZE) != 0) { + nbdflags, data) != 0) { close(sharing_fds[i]); nb_fds--; sharing_fds[i] = sharing_fds[nb_fds]; -- 1.7.7.1