From nobody Mon Feb 9 02:27:39 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=1713435187; cv=none; d=zohomail.com; s=zohoarc; b=iLO1xeWgNYsfGmc8gNu4zSqcPZ6nEeMRwk5ECKh2LlJYEFs8iG7X4QSGGMzkuAVwydetwHy+lPQPdz8/UkeIWvKx6c06fjlzGUjMApGuhLXvW0iONtncS2DAOS6541jZNLTcUUL+SKYmTa4KcHRfYiWvbXHnMsmrDYQwBB8tnwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713435187; h=Content-Type: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=lMSlSFcYeK8hInpdrU6Bwba7std9sqSqnsjh+sWoVLw=; b=Pu8KwgDaVhC3TRcEJYZmBqO7OTryb8cGMlH/IZDkv1r/rG2tms57JMEfYLD88StU8mPMVjxNTrGKGg3dlD7g6BrRd+m6LMh6kcRdUjDRk/xX2yZwqxxISOPusyKuBHCRG25PqhIKzhW6mCGo0JKu/tLiu/DGIg39YOIbVTtgzLs= 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 1713435187366711.1826109489116; Thu, 18 Apr 2024 03:13:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rxOkC-0001sb-MM; Thu, 18 Apr 2024 06:11:52 -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 1rxOk8-0001gP-SG for qemu-devel@nongnu.org; Thu, 18 Apr 2024 06:11:49 -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 1rxOk6-0004ug-SM for qemu-devel@nongnu.org; Thu, 18 Apr 2024 06:11:48 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-325-DAc8JY3dNBG_HYdfUQ1Stg-1; Thu, 18 Apr 2024 06:11:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 570C6104B502; Thu, 18 Apr 2024 10:11:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.223]) by smtp.corp.redhat.com (Postfix) with ESMTP id C5C7BC1A225; Thu, 18 Apr 2024 10:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713435106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lMSlSFcYeK8hInpdrU6Bwba7std9sqSqnsjh+sWoVLw=; b=i/VYaB5juJ4NSuUNrQzgyr9RasZ3qJd5vtz06h6Tl/LwNVnBT3ZVWCmUyeFh9qfWd4o+y2 aherhXP1WQyx/XQJv8QQ4+LoO00eiGqHgwjcX45nNGSsfFJxMn+nflQk7xRp8ZDzUYeM6r atmpXAAXNJqRCH+tmos4CdOJdiZqOdE= X-MC-Unique: DAc8JY3dNBG_HYdfUQ1Stg-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" , Paolo Bonzini , qemu-devel@nongnu.org Cc: Kevin Wolf , Hanna Reitz , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Konstantin Kostiuk , qemu-block@nongnu.org Subject: [PATCH v3 09/13] block/gluster: Use URI parsing code from glib Date: Thu, 18 Apr 2024 12:10:52 +0200 Message-ID: <20240418101056.302103-10-thuth@redhat.com> In-Reply-To: <20240418101056.302103-1-thuth@redhat.com> References: <20240418101056.302103-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 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: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.719, 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: 1713435187935100002 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. Since g_uri_get_path() returns a const pointer, we also need to tweak the parameter of parse_volume_options() (where we use the result of g_uri_get_path() as input). Reviewed-by: Eric Blake Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Thomas Huth --- block/gluster.c | 71 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index cc74af06dc..1c9505f8bb 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -17,7 +17,6 @@ #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qemu/uri.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h" @@ -289,9 +288,9 @@ static void glfs_clear_preopened(glfs_t *fs) } } =20 -static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path) +static int parse_volume_options(BlockdevOptionsGluster *gconf, const char = *path) { - char *p, *q; + const char *p, *q; =20 if (!path) { return -EINVAL; @@ -349,13 +348,13 @@ static int parse_volume_options(BlockdevOptionsGluste= r *gconf, char *path) static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf, const char *filename) { + g_autoptr(GUri) uri =3D g_uri_parse(filename, G_URI_FLAGS_NONE, NULL); + g_autoptr(GHashTable) qp =3D NULL; SocketAddress *gsconf; - URI *uri; - QueryParams *qp =3D NULL; bool is_unix =3D false; - int ret =3D 0; + const char *uri_scheme, *uri_query, *uri_server; + int uri_port, ret; =20 - uri =3D uri_parse(filename); if (!uri) { return -EINVAL; } @@ -364,57 +363,57 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, QAPI_LIST_PREPEND(gconf->server, gsconf); =20 /* transport */ - if (!uri->scheme || !strcmp(uri->scheme, "gluster")) { + uri_scheme =3D g_uri_get_scheme(uri); + if (!uri_scheme || !strcmp(uri_scheme, "gluster")) { gsconf->type =3D SOCKET_ADDRESS_TYPE_INET; - } else if (!strcmp(uri->scheme, "gluster+tcp")) { + } else if (!strcmp(uri_scheme, "gluster+tcp")) { gsconf->type =3D SOCKET_ADDRESS_TYPE_INET; - } else if (!strcmp(uri->scheme, "gluster+unix")) { + } else if (!strcmp(uri_scheme, "gluster+unix")) { gsconf->type =3D SOCKET_ADDRESS_TYPE_UNIX; is_unix =3D true; - } else if (!strcmp(uri->scheme, "gluster+rdma")) { + } else if (!strcmp(uri_scheme, "gluster+rdma")) { gsconf->type =3D SOCKET_ADDRESS_TYPE_INET; warn_report("rdma feature is not supported, falling back to tcp"); } else { - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 - ret =3D parse_volume_options(gconf, uri->path); + ret =3D parse_volume_options(gconf, g_uri_get_path(uri)); if (ret < 0) { - goto out; + return ret; } =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) { + return -EINVAL; + } + ret =3D g_hash_table_size(qp); + if (ret > 1 || (is_unix && !ret) || (!is_unix && ret)) { + return -EINVAL; + } } =20 + uri_server =3D g_uri_get_host(uri); + uri_port =3D g_uri_get_port(uri); + if (is_unix) { - if (uri->server || uri->port) { - ret =3D -EINVAL; - goto out; - } - if (strcmp(qp->p[0].name, "socket")) { - ret =3D -EINVAL; - goto out; + char *uri_socket =3D g_hash_table_lookup(qp, "socket"); + if (uri_server || uri_port !=3D -1 || !uri_socket) { + return -EINVAL; } - gsconf->u.q_unix.path =3D g_strdup(qp->p[0].value); + gsconf->u.q_unix.path =3D g_strdup(uri_socket); } else { - gsconf->u.inet.host =3D g_strdup(uri->server ? uri->server : "loca= lhost"); - if (uri->port) { - gsconf->u.inet.port =3D g_strdup_printf("%d", uri->port); + gsconf->u.inet.host =3D g_strdup(uri_server ? uri_server : "localh= ost"); + if (uri_port > 0) { + gsconf->u.inet.port =3D g_strdup_printf("%d", uri_port); } else { gsconf->u.inet.port =3D g_strdup_printf("%d", GLUSTER_DEFAULT_= PORT); } } =20 -out: - if (qp) { - query_params_free(qp); - } - uri_free(uri); - return ret; + return 0; } =20 static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, --=20 2.44.0