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
This commit is contained in:
parent
3a3b925d47
commit
279826619d
2
nbd.c
2
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];
|
||||
|
||||
|
2
nbd.h
2
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);
|
||||
|
@ -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++;
|
||||
|
Loading…
Reference in New Issue
Block a user