[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/25] qemu-nbd: remove offset argument to nbd_trip
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/25] qemu-nbd: remove offset argument to nbd_trip |
Date: |
Tue, 6 Dec 2011 16:27:38 +0100 |
The argument is write-only.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/25] nbd asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 01/25] add qemu_send_full and qemu_recv_full, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 03/25] nbd: switch to asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 05/25] nbd: allow multiple in-flight requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 04/25] nbd: split requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 02/25] sheepdog: move coroutine send/recv function to generic code, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 06/25] nbd: fix error handling in the server, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 08/25] nbd: add support for NBD_CMD_FLUSH, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 07/25] nbd: add support for NBD_CMD_FLAG_FUA, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 09/25] nbd: add support for NBD_CMD_TRIM, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 11/25] qemu-nbd: remove offset argument to nbd_trip,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 10/25] Update ioctl order in nbd_init() to detect EBUSY, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 16/25] qemu-nbd: more robust handling of invalid requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 14/25] qemu-nbd: simplify nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 12/25] qemu-nbd: remove data_size argument to nbd_trip, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 15/25] qemu-nbd: introduce nbd_do_send_reply, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 25/25] qemu-nbd: throttle requests, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 23/25] qemu-nbd: add client pointer to NBDRequest, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 24/25] qemu-nbd: asynchronous operation, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 20/25] link the main loop and its dependencies into the tools, Paolo Bonzini, 2011/12/06
- [Qemu-devel] [PATCH 19/25] qemu-nbd: introduce NBDRequest, Paolo Bonzini, 2011/12/06