From nobody Mon Nov 25 11:15:41 2024 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=1715691173; cv=none; d=zohomail.com; s=zohoarc; b=OLQUOA0Lk4orX7iouH3CWLhmhixVtZUmnkd+dQXH3xKvPfmCh5GqgWRur8jKMfZtZlL41DolL+mtnmyykQ8Ze3GcbwYLuJN6EKk3V5qcrU1xt2ng79DSJ2b+9Ld0q4MKwdIU2jO4T2rgwkTavun1cKFWHCR+8xDIJ77C6QyHL8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715691173; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=wncgA4v8L8vkEvBErE0b06OP0v4pfM0Il4czkDZATqU=; b=NxcP9OgOs1+oQ89/aSPMh6AF/6gtURYfLM/LCxgG9XkrnxBpH6EX0nCgAEQEtGFvqhdP40Fs40Z9zhtYLC5eTFbTWd/KKyP/MV6dgCHvpWL2BYgnAd04raU5ltKMmovClMpRor5ODXQcaciVRVONwyvDP+hw4woEqPLwX1omZLA= 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 1715691173932175.90012445805098; Tue, 14 May 2024 05:52:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6rdB-0005Cb-2M; Tue, 14 May 2024 08:51:45 -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 1s6rd5-0005B9-Nz for qemu-devel@nongnu.org; Tue, 14 May 2024 08:51:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6rd3-0005Ed-Un for qemu-devel@nongnu.org; Tue, 14 May 2024 08:51:39 -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-456-3r7aq70GOuWG6dgsH1AKuA-1; Tue, 14 May 2024 08:51:30 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 07538185A780; Tue, 14 May 2024 12:51:30 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42B03400EAC; Tue, 14 May 2024 12:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715691096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wncgA4v8L8vkEvBErE0b06OP0v4pfM0Il4czkDZATqU=; b=Qjmg5M426BjGfWT4aOjZX/o0ADQ9MPblPlMb/szOWoVBtWO0/o6BtuMu/6WxCTKx9Xwg8F h40guBAQIGOMy1Pl7GWOqHgFC4teqjnDEkpukcC/bkXBn5ieI2xG0o2MWWn01WvTjl34XF gLqHiQk8gWuy4+VQMtrlaPDwpXh1PH4= X-MC-Unique: 3r7aq70GOuWG6dgsH1AKuA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Subject: [PULL 07/11] block/gluster: Use URI parsing code from glib Date: Tue, 14 May 2024 14:51:15 +0200 Message-ID: <20240514125119.284638-8-thuth@redhat.com> In-Reply-To: <20240514125119.284638-1-thuth@redhat.com> References: <20240514125119.284638-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.9 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.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.974, 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=ham 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: 1715691175190100007 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 Message-Id: <20240418101056.302103-10-thuth@redhat.com> Signed-off-by: Thomas Huth --- block/gluster.c | 69 ++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index 4253c8db5e..d0999903df 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,54 +363,54 @@ 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 { - 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.45.0