From patchwork Wed Sep 28 20:55:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 9354883 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C4A996077A for ; Wed, 28 Sep 2016 20:56:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B73E32974A for ; Wed, 28 Sep 2016 20:56:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC0402975C; Wed, 28 Sep 2016 20:56:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 420952974A for ; Wed, 28 Sep 2016 20:56:53 +0000 (UTC) Received: from localhost ([::1]:33088 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpLuO-0004e2-Af for patchwork-qemu-devel@patchwork.kernel.org; Wed, 28 Sep 2016 16:56:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpLtq-0004Yr-HG for qemu-devel@nongnu.org; Wed, 28 Sep 2016 16:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bpLto-0006j2-Li for qemu-devel@nongnu.org; Wed, 28 Sep 2016 16:56:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57812) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bpLtl-0006hW-4I; Wed, 28 Sep 2016 16:56:13 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B6B378EDE; Wed, 28 Sep 2016 20:56:12 +0000 (UTC) Received: from localhost (ovpn-116-200.phx2.redhat.com [10.3.116.200]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8SKuASW022791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 28 Sep 2016 16:56:11 -0400 From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 28 Sep 2016 22:55:52 +0200 Message-Id: <20160928205602.17275-3-mreitz@redhat.com> In-Reply-To: <20160928205602.17275-1-mreitz@redhat.com> References: <20160928205602.17275-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 28 Sep 2016 20:56:12 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 02/12] block/nbd: Reject port parameter without host X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Markus Armbruster , Paolo Bonzini , Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Currently, a port that is passed along with a UNIX socket path is silently ignored. That is not exactly ideal, it should be an error instead. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf --- block/nbd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index ce7c14f..eaca33c 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -197,6 +197,7 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts *opts, Error **errp) s->path = g_strdup(qemu_opt_get(opts, "path")); s->host = g_strdup(qemu_opt_get(opts, "host")); + s->port = g_strdup(qemu_opt_get(opts, "port")); if (!s->path == !s->host) { if (s->path) { @@ -206,6 +207,10 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts *opts, Error **errp) } return NULL; } + if (s->port && !s->host) { + error_setg(errp, "port may not be used without host"); + return NULL; + } saddr = g_new0(SocketAddress, 1); @@ -217,8 +222,6 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts *opts, Error **errp) } else { InetSocketAddress *inet; - s->port = g_strdup(qemu_opt_get(opts, "port")); - saddr->type = SOCKET_ADDRESS_KIND_INET; inet = saddr->u.inet.data = g_new0(InetSocketAddress, 1); inet->host = g_strdup(s->host);