From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXwwz-0002HZ-3o for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:29:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXwwt-0000JS-Bx for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:57 -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 1RXwws-0000A8-HD for qemu-devel@nongnu.org; Tue, 06 Dec 2011 10:28:50 -0500 Received: by mail-iy0-f173.google.com with SMTP id j26so193361iaf.4 for ; Tue, 06 Dec 2011 07:28:50 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 6 Dec 2011 16:27:38 +0100 Message-Id: <1323185272-2610-12-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 11/25] qemu-nbd: remove offset argument to nbd_trip List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The argument is write-only. Signed-off-by: Paolo Bonzini --- nbd.c | 8 +++----- nbd.h | 2 +- qemu-nbd.c | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nbd.c b/nbd.c index 06064c2..f93a927 100644 --- a/nbd.c +++ b/nbd.c @@ -583,8 +583,9 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply) return 0; } -int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size) +int nbd_trip(BlockDriverState *bs, int csock, off_t size, + uint64_t dev_offset, uint32_t nbdflags, + uint8_t *data, int data_size) { struct nbd_request request; struct nbd_reply reply; @@ -635,7 +636,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, reply.error = -ret; request.len = 0; } - *offset += request.len; TRACE("Read %u byte(s)", request.len); @@ -684,8 +684,6 @@ int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, request.len = 0; } - *offset += request.len; - if (request.type & NBD_CMD_FLAG_FUA) { ret = bdrv_flush(bs); if (ret < 0) { diff --git a/nbd.h b/nbd.h index 61553f4..ebdb2db 100644 --- a/nbd.h +++ b/nbd.h @@ -72,7 +72,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, - off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size); + uint32_t nbdflags, uint8_t *data, int data_size); int nbd_client(int fd); int nbd_disconnect(int fd); diff --git a/qemu-nbd.c b/qemu-nbd.c index 291cba2..f9ee9c5 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -248,7 +248,6 @@ int main(int argc, char **argv) { BlockDriverState *bs; off_t dev_offset = 0; - off_t offset = 0; uint32_t nbdflags = 0; bool disconnect = false; const char *bindto = "0.0.0.0"; @@ -542,7 +541,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, - &offset, nbdflags, data, NBD_BUFFER_SIZE) != 0) { + nbdflags, data, NBD_BUFFER_SIZE) != 0) { close(sharing_fds[i]); nb_fds--; sharing_fds[i] = sharing_fds[nb_fds]; -- 1.7.7.1