From patchwork Fri Mar 22 17:41:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 230230 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 969BC2C00CB for ; Sat, 23 Mar 2013 05:04:46 +1100 (EST) Received: from localhost ([::1]:37479 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ63A-0000nR-70 for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 13:46:44 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yL-0000cB-0g for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ5yG-0001Lc-CH for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yG-0001KY-0B for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:40 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MHfcm3023536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 22 Mar 2013 13:41:38 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-103.ams2.redhat.com [10.36.116.103]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2MHfQDm002071; Fri, 22 Mar 2013 13:41:37 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 22 Mar 2013 18:41:16 +0100 Message-Id: <1363974083-28440-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1363974083-28440-1-git-send-email-kwolf@redhat.com> References: <1363974083-28440-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/14] nbd: Remove unused functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- 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;