From patchwork Tue Feb 11 17:03:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 319344 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 AE7D82C00B0 for ; Wed, 12 Feb 2014 04:05:19 +1100 (EST) Received: from localhost ([::1]:34897 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGlo-0007yY-QG for incoming@patchwork.ozlabs.org; Tue, 11 Feb 2014 12:05:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49004) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGkq-0006Wh-5c for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WDGkh-0008BV-NV for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:16 -0500 Received: from mail-qc0-x22b.google.com ([2607:f8b0:400d:c01::22b]:57964) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WDGkh-0008BP-Jf for qemu-devel@nongnu.org; Tue, 11 Feb 2014 12:04:07 -0500 Received: by mail-qc0-f171.google.com with SMTP id n7so13388179qcx.16 for ; Tue, 11 Feb 2014 09:04:07 -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=TQX0b3paKiIcwW0AzmxGnnHLckP94qJ+oZsBUPwF0/0SkEgHIrFVWj+v0NnouOr3JO SG8a+Z9SIvcIw3u7ePpVEXpmfzKjD89O1Sl8RgrRU5kAt1WXAgQ4Qf6FwGCEUEARMKJB iUXLN1GagCvLoHP3St+NEFVjSF93CLH5y0lRcHvo0t6SMVWdPZNVbJ//MaVWvaCawG7k ofsAhtfwEamaFWciuP/Bs6dJSWRY7Esav8jAXvyNpXB3Xspo281OT/1YZXzOjm3/nxyh w8RN9MApV9jn0CLyyfnxkxNE7JjdHCb2cDta9TaWQoFd5C6ahajPA8MeG4fBGnE4PevK r1qg== X-Received: by 10.140.85.35 with SMTP id m32mr55606756qgd.40.1392138247217; Tue, 11 Feb 2014 09:04:07 -0800 (PST) Received: from yakj.usersys.redhat.com (nat-pool-brq-u.redhat.com. [209.132.186.35]) by mx.google.com with ESMTPSA id l40sm29527992qga.13.2014.02.11.09.04.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Feb 2014 09:04:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 11 Feb 2014 18:03:36 +0100 Message-Id: <1392138233-26407-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392138233-26407-1-git-send-email-pbonzini@redhat.com> References: <1392138233-26407-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:c01::22b Cc: kwolf@redhat.com, famz@redhat.com Subject: [Qemu-devel] [PATCH v2 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) {