From nobody Mon Feb 9 03:13:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634935; cv=none; d=zohomail.com; s=zohoarc; b=WeK6/H/Le5ogZRBH1df5oSf8bRsvbWY3y737KRHSSOv2KjpDVmKSQPU0yHvXzkGBZ9tgc6YpuQCBhSSi9T9QqQu9m6wvgkuAz0QJNqFcEGHdbpYP48F/yIEaRyE5B6YwR1VxLI9T50NrFGwbgxKko2MwUwBpx9fZ9l9Wx+TN29o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634935; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cCwYOxuAMURGRsU5bRxLMi3E7NhrtJUM6uZAb1E4Gl8=; b=JpNIsFFRDgYjY8gwgwPipGt2w0Kd3odpVwXmz4y8cCCA06IMty8P9A/rfzVMheVvga4n2RbUD5Tk3w/Bp6Xiop8F+pErylEoo11Zzpf8u9soKXuZgHq8al97m7wq4vT7ePfLTUa6Llmh1tt50fnlAcOpFo56m6FabCMQCxXuntY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1711634935219389.41080655787016; Thu, 28 Mar 2024 07:08:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPI-0004QE-2W; Thu, 28 Mar 2024 10:07:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqPG-0004PG-TT for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rpqPF-0004Ux-3g for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:02 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-461-LYJl8jhLMVKmfm5-baMsTw-1; Thu, 28 Mar 2024 10:06:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7814428B6BAD; Thu, 28 Mar 2024 14:06:53 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3623040C6CB8; Thu, 28 Mar 2024 14:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cCwYOxuAMURGRsU5bRxLMi3E7NhrtJUM6uZAb1E4Gl8=; b=XIQgAiZJ1OvAAD/5UM/nnMMHyw3JjEvdeh4JHzS7jN+qvYEhMyLgu6AbkjtNjhBS61F/c+ GY10Qoy3c+IC33neyCLHRVnavOOuIsfRYIZl2h9NbF51mxRBh3sb0yZONn+SCkNFJDUXrZ 79+rrpyqgb5QCFkHlzb3Be0rMwkRul8= X-MC-Unique: LYJl8jhLMVKmfm5-baMsTw-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eric Blake , Vladimir Sementsov-Ogievskiy , Peter Lieven , "Richard W.M. Jones" , qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Konstantin Kostiuk , qemu-block@nongnu.org Subject: [PATCH for-9.1 6/9] block/nbd: Use URI parsing code from glib Date: Thu, 28 Mar 2024 15:06:03 +0100 Message-ID: <20240328140607.2433889-7-thuth@redhat.com> In-Reply-To: <20240328140607.2433889-1-thuth@redhat.com> References: <20240328140607.2433889-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634937195100003 Content-Type: text/plain; charset="utf-8" Since version 2.66, glib has useful URI parsing functions, too. Use those instead of the QEMU-internal ones to be finally able to get rid of the latter. The g_uri_get_host() also takes care of removing the square brackets from IPv6 addresses, so we can drop that part of the QEMU code now, too. Signed-off-by: Thomas Huth Reviewed-by: Richard W.M. Jones --- block/nbd.c | 66 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index ef05f7cdfd..95b507f872 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -31,7 +31,6 @@ #include "qemu/osdep.h" =20 #include "trace.h" -#include "qemu/uri.h" #include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/main-loop.h" @@ -1514,30 +1513,34 @@ static void nbd_client_close(BlockDriverState *bs) =20 static int nbd_parse_uri(const char *filename, QDict *options) { - URI *uri; + GUri *uri; const char *p; - QueryParams *qp =3D NULL; + GHashTable *qp =3D NULL; + int qp_n; int ret =3D 0; bool is_unix; + const char *uri_scheme, *uri_query, *uri_server; + int uri_port; =20 - uri =3D uri_parse(filename); + uri =3D g_uri_parse(filename, G_URI_FLAGS_NONE, NULL); if (!uri) { return -EINVAL; } =20 /* transport */ - if (!g_strcmp0(uri->scheme, "nbd")) { + uri_scheme =3D g_uri_get_scheme(uri); + if (!g_strcmp0(uri_scheme, "nbd")) { is_unix =3D false; - } else if (!g_strcmp0(uri->scheme, "nbd+tcp")) { + } else if (!g_strcmp0(uri_scheme, "nbd+tcp")) { is_unix =3D false; - } else if (!g_strcmp0(uri->scheme, "nbd+unix")) { + } else if (!g_strcmp0(uri_scheme, "nbd+unix")) { is_unix =3D true; } else { ret =3D -EINVAL; goto out; } =20 - p =3D uri->path ? uri->path : ""; + p =3D g_uri_get_path(uri) ?: ""; if (p[0] =3D=3D '/') { p++; } @@ -1545,51 +1548,58 @@ static int nbd_parse_uri(const char *filename, QDic= t *options) qdict_put_str(options, "export", p); } =20 - qp =3D query_params_parse(uri->query); - if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) { - ret =3D -EINVAL; - goto out; + uri_query =3D g_uri_get_query(uri); + if (uri_query) { + qp =3D g_uri_parse_params(uri_query, -1, "&", G_URI_PARAMS_NONE, N= ULL); + if (!qp) { + ret =3D -EINVAL; + goto out; + } + qp_n =3D g_hash_table_size(qp); + if (qp_n > 1 || (is_unix && !qp_n) || (!is_unix && qp_n)) { + ret =3D -EINVAL; + goto out; + } + } + + uri_server =3D g_uri_get_host(uri); + if (uri_server && !uri_server[0]) { + uri_server =3D NULL; } + uri_port =3D g_uri_get_port(uri); =20 if (is_unix) { /* nbd+unix:///export?socket=3Dpath */ - if (uri->server || uri->port || strcmp(qp->p[0].name, "socket")) { + const char *uri_socket =3D g_hash_table_lookup(qp, "socket"); + if (uri_server || uri_port !=3D -1 || !uri_socket) { ret =3D -EINVAL; goto out; } qdict_put_str(options, "server.type", "unix"); - qdict_put_str(options, "server.path", qp->p[0].value); + qdict_put_str(options, "server.path", uri_socket); } else { - QString *host; char *port_str; =20 /* nbd[+tcp]://host[:port]/export */ - if (!uri->server) { + if (!uri_server) { ret =3D -EINVAL; goto out; } =20 - /* strip braces from literal IPv6 address */ - if (uri->server[0] =3D=3D '[') { - host =3D qstring_from_substr(uri->server, 1, - strlen(uri->server) - 1); - } else { - host =3D qstring_from_str(uri->server); - } - qdict_put_str(options, "server.type", "inet"); - qdict_put(options, "server.host", host); + qdict_put_str(options, "server.host", uri_server); =20 - port_str =3D g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT); + port_str =3D g_strdup_printf("%d", uri_port !=3D -1 ? uri_port + : NBD_DEFAULT_PORT= ); qdict_put_str(options, "server.port", port_str); g_free(port_str); } =20 out: if (qp) { - query_params_free(qp); + g_hash_table_destroy(qp); } - uri_free(uri); + g_uri_unref(uri); return ret; } =20 --=20 2.44.0