[Qemu-devel] [5186] qemu-nbd: remove useless parameter from nbd_negotiate() ( Laurent Vivier)

[Anthony Liguori]

Revision: 5186
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5186
Author:   aliguori
Date:     2008-09-10 15:23:19 +0000 (Wed, 10 Sep 2008)

Log Message:
-----------
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 <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/nbd.c
    trunk/nbd.h
    trunk/qemu-nbd.c

Modified: trunk/nbd.c
===================================================================
--- trunk/nbd.c 2008-09-09 19:02:49 UTC (rev 5185)
+++ trunk/nbd.c 2008-09-10 15:23:19 UTC (rev 5186)
@@ -264,7 +264,7 @@
                   Request (type == 2)
 */
 
-int nbd_negotiate(BlockDriverState *bs, int csock, off_t size)
+int nbd_negotiate(int csock, off_t size)
 {
        char buf[8 + 8 + 8 + 128];
 

Modified: trunk/nbd.h
===================================================================
--- trunk/nbd.h 2008-09-09 19:02:49 UTC (rev 5185)
+++ trunk/nbd.h 2008-09-10 15:23:19 UTC (rev 5186)
@@ -50,7 +50,7 @@
 int unix_socket_outgoing(const char *path);
 int unix_socket_incoming(const char *path);
 
-int nbd_negotiate(BlockDriverState *bs, int csock, off_t size);
+int nbd_negotiate(int csock, off_t size);
 int nbd_receive_negotiate(int csock, off_t *size, size_t *blocksize);
 int nbd_init(int fd, int csock, off_t size, size_t blocksize);
 int nbd_send_request(int csock, struct nbd_request *request);

Modified: trunk/qemu-nbd.c
===================================================================
--- trunk/qemu-nbd.c    2008-09-09 19:02:49 UTC (rev 5185)
+++ trunk/qemu-nbd.c    2008-09-10 15:23:19 UTC (rev 5186)
@@ -458,7 +458,7 @@
                                              (struct sockaddr *)&addr,
                                              &addr_len);
                 if (sharing_fds[nb_fds] != -1 &&
-                    nbd_negotiate(bs, sharing_fds[nb_fds], fd_size) != -1) {
+                    nbd_negotiate(sharing_fds[nb_fds], fd_size) != -1) {
                         if (sharing_fds[nb_fds] > max_fd)
                             max_fd = sharing_fds[nb_fds];
                         nb_fds++;