From patchwork Wed Apr 6 18:28:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 8764391 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DE0BB9FC89 for ; Wed, 6 Apr 2016 18:31:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DC5A20204 for ; Wed, 6 Apr 2016 18:31:28 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 6CDD5201F2 for ; Wed, 6 Apr 2016 18:31:27 +0000 (UTC) Received: from localhost ([::1]:45007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ansEg-00034v-Nr for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Apr 2016 14:31:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ansCb-0007cq-OW for qemu-devel@nongnu.org; Wed, 06 Apr 2016 14:29:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ansCa-0006xm-JZ for qemu-devel@nongnu.org; Wed, 06 Apr 2016 14:29:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41057) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ansCX-0006wU-K3; Wed, 06 Apr 2016 14:29:13 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (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 49D137AE97; Wed, 6 Apr 2016 18:29:13 +0000 (UTC) Received: from localhost (ovpn-116-130.ams2.redhat.com [10.36.116.130]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u36ITB0e005330 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 6 Apr 2016 14:29:12 -0400 From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 6 Apr 2016 20:28:45 +0200 Message-Id: <1459967330-4573-10-git-send-email-mreitz@redhat.com> In-Reply-To: <1459967330-4573-1-git-send-email-mreitz@redhat.com> References: <1459967330-4573-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , Paolo Bonzini , Luiz Capitulino Subject: [Qemu-devel] [PATCH v3 09/14] block/nbd: Use SocketAddress options 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Drop the use of legacy options in favor of the SocketAddress representation, even for internal use (i.e. for storing the result of the filename parsing). Signed-off-by: Max Reitz --- block/nbd.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 9ae66ba..82dcb5e 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -89,9 +89,13 @@ static int nbd_parse_uri(const char *filename, QDict *options) ret = -EINVAL; goto out; } - qdict_put(options, "path", qstring_from_str(qp->p[0].value)); + qdict_put(options, "address.type", qstring_from_str("unix")); + qdict_put(options, "address.data.path", + qstring_from_str(qp->p[0].value)); } else { QString *host; + char *port_str; + /* nbd[+tcp]://host[:port]/export */ if (!uri->server) { ret = -EINVAL; @@ -106,12 +110,12 @@ static int nbd_parse_uri(const char *filename, QDict *options) host = qstring_from_str(uri->server); } - qdict_put(options, "host", host); - if (uri->port) { - char* port_str = g_strdup_printf("%d", uri->port); - qdict_put(options, "port", qstring_from_str(port_str)); - g_free(port_str); - } + qdict_put(options, "address.type", qstring_from_str("inet")); + qdict_put(options, "address.data.host", host); + + port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT); + qdict_put(options, "address.data.port", qstring_from_str(port_str)); + g_free(port_str); } out: @@ -188,7 +192,8 @@ static void nbd_parse_filename(const char *filename, QDict *options, /* are we a UNIX or TCP socket? */ if (strstart(host_spec, "unix:", &unixpath)) { - qdict_put(options, "path", qstring_from_str(unixpath)); + qdict_put(options, "address.type", qstring_from_str("unix")); + qdict_put(options, "address.data.path", qstring_from_str(unixpath)); } else { InetSocketAddress *addr = NULL; @@ -197,8 +202,9 @@ static void nbd_parse_filename(const char *filename, QDict *options, goto out; } - qdict_put(options, "host", qstring_from_str(addr->host)); - qdict_put(options, "port", qstring_from_str(addr->port)); + qdict_put(options, "address.type", qstring_from_str("inet")); + qdict_put(options, "address.data.host", qstring_from_str(addr->host)); + qdict_put(options, "address.data.port", qstring_from_str(addr->port)); qapi_free_InetSocketAddress(addr); } @@ -528,10 +534,12 @@ static void nbd_refresh_filename(BlockDriverState *bs, QDict *options) } } else { if (path) { - qdict_put(opts, "path", qstring_from_str(path)); + qdict_put(opts, "address.type", qstring_from_str("unix")); + qdict_put(opts, "address.data.path", qstring_from_str(path)); } else { - qdict_put(opts, "host", qstring_from_str(host)); - qdict_put(opts, "port", qstring_from_str(port)); + qdict_put(opts, "address.type", qstring_from_str("inet")); + qdict_put(opts, "address.data.host", qstring_from_str(host)); + qdict_put(opts, "address.data.port", qstring_from_str(port)); } } if (export) {