From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdnE-0000Qe-Hy for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:24:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHdnD-0004W2-0c for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:24:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdnC-0004Vr-PJ for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:24:14 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2IHOE9d014332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Mar 2013 13:24:14 -0400 From: Kevin Wolf Date: Mon, 18 Mar 2013 18:23:55 +0100 Message-Id: <1363627441-8297-6-git-send-email-kwolf@redhat.com> In-Reply-To: <1363627441-8297-1-git-send-email-kwolf@redhat.com> References: <1363627441-8297-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 05/11] nbd: Remove unused functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com Signed-off-by: Kevin Wolf --- include/block/nbd.h | 2 -- nbd.c | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/include/block/nbd.h b/include/block/nbd.h index 9b52d50..0903d7a 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -61,9 +61,7 @@ enum { #define NBD_BUFFER_SIZE (1024*1024) ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read); -int tcp_socket_outgoing(const char *address, uint16_t port); int tcp_socket_incoming(const char *address, uint16_t port); -int tcp_socket_outgoing_spec(const char *address_and_port); int tcp_socket_incoming_spec(const char *address_and_port); int tcp_socket_outgoing_opts(QemuOpts *opts); int unix_socket_outgoing(const char *path); diff --git a/nbd.c b/nbd.c index 97879ca..d1a67ee 100644 --- a/nbd.c +++ b/nbd.c @@ -199,25 +199,6 @@ static void combine_addr(char *buf, size_t len, const char* address, } } -int tcp_socket_outgoing(const char *address, uint16_t port) -{ - char address_and_port[128]; - combine_addr(address_and_port, 128, address, port); - return tcp_socket_outgoing_spec(address_and_port); -} - -int tcp_socket_outgoing_spec(const char *address_and_port) -{ - Error *local_err = NULL; - int fd = inet_connect(address_and_port, &local_err); - - if (local_err != NULL) { - qerror_report_err(local_err); - error_free(local_err); - } - return fd; -} - int tcp_socket_outgoing_opts(QemuOpts *opts) { Error *local_err = NULL; -- 1.8.1.4