From 279826619dfb36bac39d8549526a76eabb9d311e Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 10 Sep 2008 15:23:19 +0000 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5186 c046a42c-6fe2-441c-8c8c-71466251a162 --- nbd.c | 2 +- nbd.h | 2 +- qemu-nbd.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nbd.c b/nbd.c index 9bebe4a9bb..ee5427cab4 100644 --- a/nbd.c +++ b/nbd.c @@ -264,7 +264,7 @@ error: 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]; diff --git a/nbd.h b/nbd.h index 55ba1ba01e..ede1e746cb 100644 --- a/nbd.h +++ b/nbd.h @@ -50,7 +50,7 @@ int tcp_socket_incoming(const char *address, uint16_t port); 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); diff --git a/qemu-nbd.c b/qemu-nbd.c index 916150e424..d5d5db73a0 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -458,7 +458,7 @@ int main(int argc, char **argv) (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++;