From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KdRXQ-0008Ls-5z for qemu-devel@nongnu.org; Wed, 10 Sep 2008 11:23:24 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KdRXO-0008La-Vl for qemu-devel@nongnu.org; Wed, 10 Sep 2008 11:23:23 -0400 Received: from [199.232.76.173] (port=36169 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KdRXO-0008LV-R6 for qemu-devel@nongnu.org; Wed, 10 Sep 2008 11:23:22 -0400 Received: from savannah.gnu.org ([199.232.41.3]:36910 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KdRXO-0003EV-Ee for qemu-devel@nongnu.org; Wed, 10 Sep 2008 11:23:22 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1KdRXM-0003Dy-KA for qemu-devel@nongnu.org; Wed, 10 Sep 2008 15:23:20 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1KdRXM-0003Ds-Bf for qemu-devel@nongnu.org; Wed, 10 Sep 2008 15:23:20 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Wed, 10 Sep 2008 15:23:20 +0000 Subject: [Qemu-devel] [5186] qemu-nbd: remove useless parameter from nbd_negotiate() ( Laurent Vivier) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5186 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5186 Author: aliguori Date: 2008-09-10 15:23:19 +0000 (Wed, 10 Sep 2008) Log Message: ----------- 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 Modified Paths: -------------- trunk/nbd.c trunk/nbd.h trunk/qemu-nbd.c Modified: trunk/nbd.c =================================================================== --- trunk/nbd.c 2008-09-09 19:02:49 UTC (rev 5185) +++ trunk/nbd.c 2008-09-10 15:23:19 UTC (rev 5186) @@ -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]; Modified: trunk/nbd.h =================================================================== --- trunk/nbd.h 2008-09-09 19:02:49 UTC (rev 5185) +++ trunk/nbd.h 2008-09-10 15:23:19 UTC (rev 5186) @@ -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); Modified: trunk/qemu-nbd.c =================================================================== --- trunk/qemu-nbd.c 2008-09-09 19:02:49 UTC (rev 5185) +++ trunk/qemu-nbd.c 2008-09-10 15:23:19 UTC (rev 5186) @@ -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++;