From patchwork Mon Feb 17 13:43:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 320982 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 789A22C00BB for ; Tue, 18 Feb 2014 00:47:35 +1100 (EST) Received: from localhost ([::1]:40623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFOXl-0003Yu-Be for incoming@patchwork.ozlabs.org; Mon, 17 Feb 2014 08:47:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFOUr-0000Tv-7d for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:44:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFOUi-0000gT-JK for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:44:33 -0500 Received: from mail-qa0-x232.google.com ([2607:f8b0:400d:c00::232]:40535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFOUi-0000gP-F8 for qemu-devel@nongnu.org; Mon, 17 Feb 2014 08:44:24 -0500 Received: by mail-qa0-f50.google.com with SMTP id cm18so21419395qab.37 for ; Mon, 17 Feb 2014 05:44:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9eJ+vs1LzktI5533cnjJ1CJ+hjCybiQUn5H981Q+dWo=; b=ebi2jCxS2vAIq6qxqvlt1i2jNzmpOWpY5eVLpzL58V1clpdE3c9GL2KSEZBujAFCad xTe6OVnNUzZHV3Yac+6/cP8IYAc/o6tAqvkmC+lVZLTLhPIjYQax7Tbe5mk0/DDCPzf1 A4a7AizGbR7InIM3MeFjpooRV67r6yoQSoo2CMWERC06HIezotBrBAQjGWA9jGA5NsAV dRzkf51OKFzYlScRT6+e+wo2xoCc3UeIRomedn2t7tOuyEXcd1kX2Cg5umFlC6K72v8y GvJVlaJzWVaeuia4oud+iRgoOo9MEibVaBbNioL8KMccwf7l2apcidXbrR7bEFyyaRd8 q8FQ== X-Received: by 10.140.51.109 with SMTP id t100mr32247376qga.50.1392644664054; Mon, 17 Feb 2014 05:44:24 -0800 (PST) Received: from yakj.usersys.redhat.com (net-37-117-154-249.cust.vodafonedsl.it. [37.117.154.249]) by mx.google.com with ESMTPSA id p10sm45265803qag.8.2014.02.17.05.44.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 05:44:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 17 Feb 2014 14:43:50 +0100 Message-Id: <1392644647-9897-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392644647-9897-1-git-send-email-pbonzini@redhat.com> References: <1392644647-9897-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::232 Cc: kwolf@redhat.com, jcody@redhat.com, famz@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 03/20] nbd: inline tcp_socket_incoming_spec into sole caller 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: Paolo Bonzini --- include/block/nbd.h | 1 - nbd.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/block/nbd.h b/include/block/nbd.h index e10ab82..1b39c06 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -63,7 +63,6 @@ enum { ssize_t nbd_wr_sync(int fd, void *buffer, size_t size, bool do_read); int tcp_socket_incoming(const char *address, uint16_t port); -int tcp_socket_incoming_spec(const char *address_and_port); int unix_socket_outgoing(const char *path); int unix_socket_incoming(const char *path); diff --git a/nbd.c b/nbd.c index 17ca95b..2fc1f1f 100644 --- a/nbd.c +++ b/nbd.c @@ -202,13 +202,9 @@ static void combine_addr(char *buf, size_t len, const char* address, int tcp_socket_incoming(const char *address, uint16_t port) { char address_and_port[128]; - combine_addr(address_and_port, 128, address, port); - return tcp_socket_incoming_spec(address_and_port); -} - -int tcp_socket_incoming_spec(const char *address_and_port) -{ Error *local_err = NULL; + + combine_addr(address_and_port, 128, address, port); int fd = inet_listen(address_and_port, NULL, 0, SOCK_STREAM, 0, &local_err); if (local_err != NULL) {