commit 279826619dfb36bac39d8549526a76eabb9d311e
author aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Sep 10 15:23:19 2008 +0000
committer aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Sep 10 15:23:19 2008 +0000
tree 31e7afa5cdb96c7d1fde4031d13d3eea48e998b3
parent 3a3b925d4724e729a7cfe33c4f61e346252a2a2f

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

nbd.c

diff --git a/nbd.c b/nbd.c
index 9bebe4a..ee5427c 100644
--- a/nbd.c
+++ b/nbd.c
@@ -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];
 

nbd.h

diff --git a/nbd.h b/nbd.h
index 55ba1ba..ede1e74 100644
--- a/nbd.h
+++ b/nbd.h
@@ -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);

qemu-nbd.c

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 916150e..d5d5db7 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -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++;