falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-nbd: remove offset argument to nbd_trip 

The argument is write-only.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-09-19 13:50:54 +02:00
parent 3e05c78551
commit 94607e7a77
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nbd.c
View File

@ -583,8 +583,9 @@ static int nbd_send_reply(int csock, struct nbd_reply *reply)
return 0; return 0;
} }
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, int nbd_trip(BlockDriverState *bs, int csock, off_t size,
off_t *offset, uint32_t nbdflags, uint8_t *data, int data_size) uint64_t dev_offset, uint32_t nbdflags,
uint8_t *data, int data_size)
{ {
struct nbd_request request; struct nbd_request request;
struct nbd_reply reply; 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; reply.error = -ret;
request.len = 0; request.len = 0;
} }
*offset += request.len;
TRACE("Read %u byte(s)", 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; request.len = 0;
} }
*offset += request.len;
if (request.type & NBD_CMD_FLAG_FUA) { if (request.type & NBD_CMD_FLAG_FUA) {
ret = bdrv_flush(bs); ret = bdrv_flush(bs);
if (ret < 0) { if (ret < 0) {

2
nbd.h
View File

@ -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_send_request(int csock, struct nbd_request *request);
int nbd_receive_reply(int csock, struct nbd_reply *reply); int nbd_receive_reply(int csock, struct nbd_reply *reply);
int nbd_trip(BlockDriverState *bs, int csock, off_t size, uint64_t dev_offset, 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_client(int fd);
int nbd_disconnect(int fd); int nbd_disconnect(int fd);

3
qemu-nbd.c
View File

@ -248,7 +248,6 @@ int main(int argc, char **argv)
{ {
BlockDriverState *bs; BlockDriverState *bs;
off_t dev_offset = 0; off_t dev_offset = 0;
off_t offset = 0;
uint32_t nbdflags = 0; uint32_t nbdflags = 0;
bool disconnect = false; bool disconnect = false;
const char *bindto = "0.0.0.0"; 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++) { for (i = 1; i < nb_fds && ret; i++) {
if (FD_ISSET(sharing_fds[i], &fds)) { if (FD_ISSET(sharing_fds[i], &fds)) {
if (nbd_trip(bs, sharing_fds[i], fd_size, dev_offset, 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]); close(sharing_fds[i]);
nb_fds--; nb_fds--;
sharing_fds[i] = sharing_fds[nb_fds]; sharing_fds[i] = sharing_fds[nb_fds];