Revision 27982661

b/nbd.c
264 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 269
	char buf[8 + 8 + 8 + 128];
270 270

  
b/nbd.h
50 50
int unix_socket_outgoing(const char *path);
51 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 54
int nbd_receive_negotiate(int csock, off_t *size, size_t *blocksize);
55 55
int nbd_init(int fd, int csock, off_t size, size_t blocksize);
56 56
int nbd_send_request(int csock, struct nbd_request *request);
b/qemu-nbd.c
458 458
                                             (struct sockaddr *)&addr,
459 459
                                             &addr_len);
460 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 462
                        if (sharing_fds[nb_fds] > max_fd)
463 463
                            max_fd = sharing_fds[nb_fds];
464 464
                        nb_fds++;

Also available in: Unified diff