gwj / at91sam9263 · Commits

Commit 279826619dfb36bac39d8549526a76eabb9d311e

Authored by aliguori
1 parent 3a3b925d

qemu-nbd: remove useless parameter from nbd_negotiate() (Laurent Vivier) 

This patch removes "BlockDriverState *bs" from nbd_negotiate() because
it is not used.

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.fr>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5186 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 3 changed files with 3 additions and 3 deletions
@@ -264,7 +264,7 @@ error: @@ -264,7 +264,7 @@ error:
264 Request (type == 2) 264 Request (type == 2)
265 */ 265 */
266 266
267 -int nbd_negotiate(BlockDriverState *bs, int csock, off_t size) 267 +int nbd_negotiate(int csock, off_t size)
268 { 268 {
269 char buf[8 + 8 + 8 + 128]; 269 char buf[8 + 8 + 8 + 128];
270 270
@@ -50,7 +50,7 @@ int tcp_socket_incoming(const char *address, uint16_t port); @@ -50,7 +50,7 @@ int tcp_socket_incoming(const char *address, uint16_t port);
50 int unix_socket_outgoing(const char *path); 50 int unix_socket_outgoing(const char *path);
51 int unix_socket_incoming(const char *path); 51 int unix_socket_incoming(const char *path);
52 52
53 -int nbd_negotiate(BlockDriverState *bs, int csock, off_t size); 53 +int nbd_negotiate(int csock, off_t size);
54 int nbd_receive_negotiate(int csock, off_t *size, size_t *blocksize); 54 int nbd_receive_negotiate(int csock, off_t *size, size_t *blocksize);
55 int nbd_init(int fd, int csock, off_t size, size_t blocksize); 55 int nbd_init(int fd, int csock, off_t size, size_t blocksize);
56 int nbd_send_request(int csock, struct nbd_request *request); 56 int nbd_send_request(int csock, struct nbd_request *request);
qemu-nbd.c
  View file @2798266
@@ -458,7 +458,7 @@ int main(int argc, char **argv) @@ -458,7 +458,7 @@ int main(int argc, char **argv)
458 (struct sockaddr *)&addr, 458 (struct sockaddr *)&addr,
459 &addr_len); 459 &addr_len);
460 if (sharing_fds[nb_fds] != -1 && 460 if (sharing_fds[nb_fds] != -1 &&
461 - nbd_negotiate(bs, sharing_fds[nb_fds], fd_size) != -1) { 461 + nbd_negotiate(sharing_fds[nb_fds], fd_size) != -1) {
462 if (sharing_fds[nb_fds] > max_fd) 462 if (sharing_fds[nb_fds] > max_fd)
463 max_fd = sharing_fds[nb_fds]; 463 max_fd = sharing_fds[nb_fds];
464 nb_fds++; 464 nb_fds++;