From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kccuy-0005N3-8F for qemu-devel@nongnu.org; Mon, 08 Sep 2008 05:20:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kccuw-0005L4-6v for qemu-devel@nongnu.org; Mon, 08 Sep 2008 05:20:19 -0400 Received: from [199.232.76.173] (port=38182 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kccuv-0005KV-KI for qemu-devel@nongnu.org; Mon, 08 Sep 2008 05:20:17 -0400 Received: from ecfrec.frec.bull.fr ([129.183.4.8]:38833) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kccuv-0001qJ-62 for qemu-devel@nongnu.org; Mon, 08 Sep 2008 05:20:17 -0400 Received: from localhost (localhost [127.0.0.1]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id B5C861A0FFD for ; Mon, 8 Sep 2008 11:20:10 +0200 (CEST) Received: from ecfrec.frec.bull.fr ([127.0.0.1]) by localhost (ecfrec.frec.bull.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 31938-09 for ; Mon, 8 Sep 2008 11:20:08 +0200 (CEST) Received: from cyclope.frec.bull.fr (cyclope.frec.bull.fr [129.183.4.9]) by ecfrec.frec.bull.fr (Postfix) with ESMTP id F244C1A0F50 for ; Mon, 8 Sep 2008 11:20:07 +0200 (CEST) Received: from [129.183.101.63] (frecb007144.frec.bull.fr [129.183.101.63]) by cyclope.frec.bull.fr (Postfix) with ESMTP id E298D2728D for ; Mon, 8 Sep 2008 11:20:05 +0200 (CEST) From: Laurent Vivier Content-Type: multipart/mixed; boundary="=-3idvP5JF8l/90AZSSrTZ" Date: Mon, 08 Sep 2008 11:20:12 +0200 Message-Id: <1220865612.4147.6.camel@frecb07144> Mime-Version: 1.0 Subject: [Qemu-devel] [PATCH] qemu-nbd: remove useless parameter from nbd_negotiate() 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" --=-3idvP5JF8l/90AZSSrTZ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable This patch removes "BlockDriverState *bs" from nbd_negotiate() because it is not used. Signed-off-by: Laurent Vivier --=20 ----------------- Laurent.Vivier@bull.net ------------------ "La perfection est atteinte non quand il ne reste rien =C3=A0 ajouter mais quand il ne reste rien =C3=A0 enlever." Saint Exup=C3=A9ry --=-3idvP5JF8l/90AZSSrTZ Content-Disposition: attachment; filename=nbd_negotiate.patch Content-Type: text/x-vhdl; name=nbd_negotiate.patch; charset=UTF-8 Content-Transfer-Encoding: 7bit --- 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++; --=-3idvP5JF8l/90AZSSrTZ--