[Qemu-devel] [PATCH] qemu-nbd: remove useless parameter from nbd_negotiate()

[Qemu-devel] [PATCH] qemu-nbd: remove useless parameter from nbd_negotiate()

[Laurent Vivier]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

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

Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.fr>
-- 
----------------- Laurent.Vivier@bull.net  ------------------
  "La perfection est atteinte non quand il ne reste rien à
ajouter mais quand il ne reste rien à enlever." Saint Exupéry

[-- Attachment #2: nbd_negotiate.patch --]
[-- Type: text/x-vhdl, Size: 1921 bytes --]

---
 nbd.c      |    2 +-
 nbd.h      |    2 +-
 qemu-nbd.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Index: qemu/nbd.c
===================================================================
--- qemu.orig/nbd.c	2008-09-07 11:35:40.000000000 +0200
+++ qemu/nbd.c	2008-09-07 11:35:51.000000000 +0200
@@ -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];
 
Index: qemu/nbd.h
===================================================================
--- qemu.orig/nbd.h	2008-09-07 11:35:25.000000000 +0200
+++ qemu/nbd.h	2008-09-07 11:35:39.000000000 +0200
@@ -50,7 +50,7 @@ int tcp_socket_incoming(const char *addr
 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);
Index: qemu/qemu-nbd.c
===================================================================
--- qemu.orig/qemu-nbd.c	2008-09-07 11:36:05.000000000 +0200
+++ qemu/qemu-nbd.c	2008-09-07 11:36:14.000000000 +0200
@@ -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++;

Re: [Qemu-devel] [PATCH] qemu-nbd: remove useless parameter from nbd_negotiate()

[Anthony Liguori]

Laurent Vivier wrote:
> This patch removes "BlockDriverState *bs" from nbd_negotiate() because
> it is not used.
>
> Signed-off-by: Laurent Vivier <Laurent.Vivier@bull.fr>
>   
Applied.  Thanks.

Regards,

Anthony Liguori