From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634927; cv=none; d=zohomail.com; s=zohoarc; b=F+8qx0eKNxjrZB2E8CQmh+/Zhgn8vVGZ1IHBprlVPyTzW/JSdDu6shhtBnObvW8mZO3iOKHtVfRRn02rt6/vK2o27phUNYXo4iEaYED6sdjYy44X512lfTWXBh3sC9idlGfHHWFgHZJ8uMFcsAae4rW3QbrSistYyhGaClsAdSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634927; 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=LPAFbLYFjCDuBVCeROV9miF2jLNUcyNa8HrpV9WnAno=; b=CIseCzzFJH/ZnHVwOMThm3tS9e/DeD4QYLRGPK4+0ZAl/J6w55W+WlDy134oTbvM0iy2UrutVb6AvR1GviVNM2VfAcoTYi7gsAlSIIfpYNCDsnHrAhq1yDrZGaka3hiuiz7HhgTXvvre3PquWUXrk2LDuM0sacWyFxXIikKTA+Y= 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+importer2=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 1711634927952226.86716349397204; Thu, 28 Mar 2024 07:08:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqP2-0004Ge-Fv; Thu, 28 Mar 2024 10:06:48 -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 1rpqP1-0004GB-Et for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:47 -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 1rpqOz-0004K0-3V for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:47 -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-479-cWAxeMWzOt-YbmqFrm9j5w-1; Thu, 28 Mar 2024 10:06:40 -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 293B610189AC; Thu, 28 Mar 2024 14:06:39 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFAD340C6CB1; Thu, 28 Mar 2024 14:06:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634803; 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=LPAFbLYFjCDuBVCeROV9miF2jLNUcyNa8HrpV9WnAno=; b=QwOKxO+e337R/TM5lc/EFeLtx+TnJimiW0k6hnU7LOuRPIvYPC/0QpHAbNRadYkmawkGFp OTsKkmCl5BMaL6WTw2RJyXQ7l32lENJH++xOpstCBOlydG+7xio0vo6ZYHgOvewMxeXtjR zjl5Bf9b5+eRNjh660DD70scVk5arAg= X-MC-Unique: cWAxeMWzOt-YbmqFrm9j5w-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 1/9] tests: Remove Ubuntu 20.04 container Date: Thu, 28 Mar 2024 15:05:58 +0100 Message-ID: <20240328140607.2433889-2-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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634928464100005 Content-Type: text/plain; charset="utf-8" Since Ubuntu 22.04 is now available since two years, we can stop actively supporting the previous LTS version of Ubuntu now. Signed-off-by: Thomas Huth --- tests/docker/dockerfiles/ubuntu2004.docker | 157 --------------------- tests/lcitool/refresh | 1 - 2 files changed, 158 deletions(-) delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker deleted file mode 100644 index d3e212060c..0000000000 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ /dev/null @@ -1,157 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool dockerfile --layers all ubuntu-2004 qemu -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/ubuntu:20.04 - -RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - bash \ - bc \ - bison \ - bsdmainutils \ - bzip2 \ - ca-certificates \ - ccache \ - clang \ - dbus \ - debianutils \ - diffutils \ - exuberant-ctags \ - findutils \ - flex \ - g++ \ - gcc \ - gcovr \ - gettext \ - git \ - hostname \ - libaio-dev \ - libasan6 \ - libasound2-dev \ - libattr1-dev \ - libbrlapi-dev \ - libbz2-dev \ - libc6-dev \ - libcacard-dev \ - libcap-ng-dev \ - libcapstone-dev \ - libcmocka-dev \ - libcurl4-gnutls-dev \ - libdaxctl-dev \ - libdrm-dev \ - libepoxy-dev \ - libfdt-dev \ - libffi-dev \ - libfuse3-dev \ - libgbm-dev \ - libgcrypt20-dev \ - libglib2.0-dev \ - libglusterfs-dev \ - libgnutls28-dev \ - libgtk-3-dev \ - libibumad-dev \ - libibverbs-dev \ - libiscsi-dev \ - libjemalloc-dev \ - libjpeg-turbo8-dev \ - libjson-c-dev \ - liblttng-ust-dev \ - liblzo2-dev \ - libncursesw5-dev \ - libnfs-dev \ - libnuma-dev \ - libpam0g-dev \ - libpcre2-dev \ - libpixman-1-dev \ - libpmem-dev \ - libpng-dev \ - libpulse-dev \ - librbd-dev \ - librdmacm-dev \ - libsasl2-dev \ - libsdl2-dev \ - libsdl2-image-dev \ - libseccomp-dev \ - libselinux1-dev \ - libslirp-dev \ - libsnappy-dev \ - libsndio-dev \ - libspice-protocol-dev \ - libspice-server-dev \ - libssh-dev \ - libsystemd-dev \ - libtasn1-6-dev \ - libubsan1 \ - libudev-dev \ - libusb-1.0-0-dev \ - libusbredirhost-dev \ - libvdeplug-dev \ - libvirglrenderer-dev \ - libvte-2.91-dev \ - libxen-dev \ - libzstd-dev \ - llvm \ - locales \ - make \ - mtools \ - multipath-tools \ - ncat \ - nettle-dev \ - ninja-build \ - openssh-client \ - pkgconf \ - python3 \ - python3-numpy \ - python3-opencv \ - python3-pillow \ - python3-pip \ - python3-setuptools \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - python3-wheel \ - python3-yaml \ - rpm2cpio \ - sed \ - socat \ - sparse \ - systemtap-sdt-dev \ - tar \ - tesseract-ocr \ - tesseract-ocr-eng \ - xfslibs-dev \ - xorriso \ - zlib1g-dev \ - zstd && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN /usr/bin/pip3 install \ - meson=3D=3D0.63.2 \ - tomli - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" -# As a final step configure the user (if env is defined) -ARG USER -ARG UID -RUN if [ "${USER}" ]; then \ - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index fe7692c500..692752a3df 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -130,7 +130,6 @@ try: trailer=3D"".join(debian12_extras)) generate_dockerfile("fedora", "fedora-38") generate_dockerfile("opensuse-leap", "opensuse-leap-15") - generate_dockerfile("ubuntu2004", "ubuntu-2004") generate_dockerfile("ubuntu2204", "ubuntu-2204") =20 # --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634856; cv=none; d=zohomail.com; s=zohoarc; b=aDo/nxwh+e6uYIY5Hc7PShDm99EJe+/H+XaoDvNxo9mNlftMwdSCvEBMrDbZo9RnfXun6QzfdMaBIja+noB0yzZfDW0KlmFe/spT4zWhZzJR7ElDgN5D4BFnNZTVxpjHmEG6eEUljjjYREknCtGrdv3JbqgML0mEJFIipV7yiio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634856; 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=H4f17dFDuFuZZNFUhkeaJrLTWJaiLBGiFpadx1g8rgA=; b=kgS+MYPBRWOcu22jedd+yLnZCUtibzWSb/kcAJ5dHtDm5xyebY+YsrrldL+konik0hNJFLjV1HcCXbleNBXYGoyPpgwODx1Wadkx1DTH09dWxFVmBaLfVN/zVAxlHSCO2K1grY3BAmNHMNTSfK7bzwbNLigS67HqvmE8XfJRet8= 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+importer2=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 1711634856600838.9460686054184; Thu, 28 Mar 2024 07:07:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPF-0004OX-II; Thu, 28 Mar 2024 10:07:01 -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 1rpqPD-0004Lc-GP for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:59 -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 1rpqPC-0004SM-2I for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:59 -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-59-i9knqaG9PtGbh9-u2Msotw-1; Thu, 28 Mar 2024 10:06:50 -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 8A34828EC123; Thu, 28 Mar 2024 14:06:42 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B00940C6CB1; Thu, 28 Mar 2024 14:06:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634817; 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=H4f17dFDuFuZZNFUhkeaJrLTWJaiLBGiFpadx1g8rgA=; b=Dez6t6gpjPQDiZty/XzTZyW5QIpZtlD2C8u0ci4o0b5L/YFsrud6tOf3SVwAmKX/D9QCng cdZVUEFxBzoXwl0Jl3Gx+k7UZuDb0URwyn9O3X/Gx52ATOa8GE6EgeT40+Wypbz3sm0SkR daEgnrFW7tjoGTqc8UGxiJ3zjqrqlhw= X-MC-Unique: i9knqaG9PtGbh9-u2Msotw-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 2/9] tests/lcitool/libvirt-ci: Update to the latest master branch Date: Thu, 28 Mar 2024 15:05:59 +0100 Message-ID: <20240328140607.2433889-3-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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634858309100003 Content-Type: text/plain; charset="utf-8" We need the latest fixes for the lcitool to be able to properly update our CentOS docker file to CentOS Stream 9. Signed-off-by: Thomas Huth --- tests/lcitool/libvirt-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 77c800186f..e25d813a62 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 77c800186f34b21be7660750577cc5582a914deb +Subproject commit e25d813a62fb8fa0ee7aa0748cf720b59a187e71 --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634908; cv=none; d=zohomail.com; s=zohoarc; b=muy+w488LMTj19tBOSCgnCjGNIlOFY2LCx4aYq0TaKWXiH2WkRVakm/iqtizVqD3MfEPRjHUoH/AqF9Ruqinur8H6+8QL59lWE+jUQNvf6k22LxdRWlGN2c2wdiG8WopRfzb92zVkGeBMtlksff/noO6Mq9DGwwAINwrE7GkWuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634908; 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=1M/K+IobY5rS2ZhVbDRD+cdR2CWk3qUfGdTRUvJzxzw=; b=BkDFpH/bdBRa/prnraXbne9/YIfeAU+Af4JQv8N/XgV5VM7/9xJk0lL8ZhHOFmoqkp1FrH4IO5eN6sGki+LD/ywEPiPj+O2zOhKGQyfSxHWwPx6gxuYus9DuiuCwieg95GL9AK3Lwyfk80vdJq9SY2YFXx0dggPbipxwnxsKaPA= 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+importer2=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 1711634908657519.8039905634753; Thu, 28 Mar 2024 07:08:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPA-0004IN-Bv; Thu, 28 Mar 2024 10:06:56 -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 1rpqP8-0004HW-7V for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:54 -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 1rpqP5-0004Ly-U7 for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:53 -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-319-QZU0E1kxNhaRr3jVPbcBsA-1; Thu, 28 Mar 2024 10:06:46 -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 E4934856D3D; Thu, 28 Mar 2024 14:06:45 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 290B640C6CB4; Thu, 28 Mar 2024 14:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634811; 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=1M/K+IobY5rS2ZhVbDRD+cdR2CWk3qUfGdTRUvJzxzw=; b=HLx/eHqEIkGj7bl6i4cMj9+bUWZnYxywg1vb534X7aqeoDDToB4XXVh2klPNmmAFCec8ik y+iSjDUuN3NL9MGtiAXZuSH8C6hir62hOjQWkvq18LbuyNv40XJXcjaYks+uruCKYS2pwo snmlBQdiaPNdjqGNc3kqgKRvO0prdps= X-MC-Unique: QZU0E1kxNhaRr3jVPbcBsA-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 3/9] tests: Update our CI to use CentOS Stream 9 instead of 8 Date: Thu, 28 Mar 2024 15:06:00 +0100 Message-ID: <20240328140607.2433889-4-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+importer2=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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634910401100006 Content-Type: text/plain; charset="utf-8" RHEL 9 (and thus also the derivatives) are available since two years now, so according to QEMU's support policy, we can drop the active support for the previous major version 8 now. Thus upgrade our CentOS Stream container to major version 9 now. Signed-off-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 16 ++++----- .gitlab-ci.d/container-core.yml | 4 +-- .../{centos8.docker =3D> centos9.docker} | 34 +++++++------------ tests/lcitool/mappings.yml | 20 ----------- tests/lcitool/refresh | 2 +- tests/vm/centos | 4 +-- 6 files changed, 26 insertions(+), 54 deletions(-) rename tests/docker/dockerfiles/{centos8.docker =3D> centos9.docker} (82%) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index cfdff175c3..9f34c650d6 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -158,9 +158,9 @@ build-system-centos: - .native_build_job_template - .native_build_artifact_template needs: - job: amd64-centos8-container + job: amd64-centos9-container variables: - IMAGE: centos8 + IMAGE: centos9 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt --enable-vfio-user-se= rver --enable-modules --enable-trace-backends=3Ddtrace --enable-docs TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu @@ -242,7 +242,7 @@ check-system-centos: - job: build-system-centos artifacts: true variables: - IMAGE: centos8 + IMAGE: centos9 MAKE_CHECK_ARGS: check =20 avocado-system-centos: @@ -251,7 +251,7 @@ avocado-system-centos: - job: build-system-centos artifacts: true variables: - IMAGE: centos8 + IMAGE: centos9 MAKE_CHECK_ARGS: check-avocado AVOCADO_TAGS: arch:ppc64 arch:or1k arch:s390x arch:x86_64 arch:rx arch:sh4 arch:nios2 @@ -327,9 +327,9 @@ avocado-system-flaky: build-tcg-disabled: extends: .native_build_job_template needs: - job: amd64-centos8-container + job: amd64-centos9-container variables: - IMAGE: centos8 + IMAGE: centos9 script: - mkdir build - cd build @@ -651,9 +651,9 @@ build-tci: build-without-defaults: extends: .native_build_job_template needs: - job: amd64-centos8-container + job: amd64-centos9-container variables: - IMAGE: centos8 + IMAGE: centos9 CONFIGURE_ARGS: --without-default-devices --without-default-features diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.= yml index 08f8450fa1..5459447676 100644 --- a/.gitlab-ci.d/container-core.yml +++ b/.gitlab-ci.d/container-core.yml @@ -1,10 +1,10 @@ include: - local: '/.gitlab-ci.d/container-template.yml' =20 -amd64-centos8-container: +amd64-centos9-container: extends: .container_job_template variables: - NAME: centos8 + NAME: centos9 =20 amd64-fedora-container: extends: .container_job_template diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos9.docker similarity index 82% rename from tests/docker/dockerfiles/centos8.docker rename to tests/docker/dockerfiles/centos9.docker index d97c30e96a..9fc9b27eb7 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -1,15 +1,14 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile --layers all centos-stream-8 qemu +# $ lcitool dockerfile --layers all centos-stream-9 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -FROM quay.io/centos/centos:stream8 +FROM quay.io/centos/centos:stream9 =20 RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y powertools && \ - dnf install -y centos-release-advanced-virtualization && \ + dnf config-manager --set-enabled -y crb && \ dnf install -y epel-release && \ dnf install -y epel-next-release && \ dnf install -y \ @@ -42,7 +41,6 @@ RUN dnf distro-sync -y && \ glib2-static \ glibc-langpack-en \ glibc-static \ - glusterfs-api-devel \ gnutls-devel \ gtk3-devel \ hostname \ @@ -82,6 +80,7 @@ RUN dnf distro-sync -y && \ lzo-devel \ make \ mesa-libgbm-devel \ + meson \ mtools \ ncurses-devel \ nettle-devel \ @@ -95,25 +94,25 @@ RUN dnf distro-sync -y && \ pixman-devel \ pkgconfig \ pulseaudio-libs-devel \ - python38 \ - python38-PyYAML \ - python38-numpy \ - python38-pip \ - python38-setuptools \ - python38-wheel \ + python3 \ + python3-PyYAML \ + python3-numpy \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx_rtd_theme \ + python3-tomli \ rdma-core-devel \ sed \ snappy-devel \ socat \ spice-protocol \ - spice-server-devel \ swtpm \ systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ util-linux \ - virglrenderer-devel \ vte291-devel \ which \ xfsprogs-devel \ @@ -131,18 +130,11 @@ RUN dnf distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3.8 install \ - meson=3D=3D0.63.2 \ - pillow \ - sphinx \ - sphinx-rtd-theme \ - tomli - ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3.8" +ENV PYTHON "/usr/bin/python3" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 407c03301b..03b974ad02 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -1,66 +1,50 @@ mappings: flake8: - CentOSStream8: OpenSUSELeap15: =20 meson: - CentOSStream8: OpenSUSELeap15: =20 python3: - CentOSStream8: python38 OpenSUSELeap15: python311-base =20 python3-PyYAML: - CentOSStream8: python38-PyYAML OpenSUSELeap15: =20 python3-devel: - CentOSStream8: python38-devel OpenSUSELeap15: python311-devel =20 python3-docutils: - CentOSStream8: OpenSUSELeap15: =20 python3-numpy: - CentOSStream8: python38-numpy OpenSUSELeap15: =20 python3-opencv: - CentOSStream8: OpenSUSELeap15: =20 python3-pillow: - CentOSStream8: OpenSUSELeap15: =20 python3-pip: - CentOSStream8: python38-pip OpenSUSELeap15: python311-pip =20 python3-pillow: - CentOSStream8: OpenSUSELeap15: =20 python3-selinux: - CentOSStream8: OpenSUSELeap15: =20 python3-setuptools: - CentOSStream8: python38-setuptools OpenSUSELeap15: python311-setuptools =20 python3-sphinx: - CentOSStream8: OpenSUSELeap15: =20 python3-sphinx-rtd-theme: - CentOSStream8: OpenSUSELeap15: =20 python3-sqlite3: - CentOSStream8: python38 OpenSUSELeap15: python311 =20 python3-tomli: @@ -69,15 +53,11 @@ mappings: Fedora: Debian12: OpenSUSELeap15: - # Not available for Python 3.8 - CentOSStream8: =20 python3-venv: - CentOSStream8: python38 OpenSUSELeap15: python311-base =20 python3-wheel: - CentOSStream8: python38-wheel OpenSUSELeap15: python311-pip =20 pypi_mappings: diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 692752a3df..24a735a3f2 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -125,7 +125,7 @@ try: # Standard native builds # generate_dockerfile("alpine", "alpine-318") - generate_dockerfile("centos8", "centos-stream-8") + generate_dockerfile("centos9", "centos-stream-9") generate_dockerfile("debian", "debian-12", trailer=3D"".join(debian12_extras)) generate_dockerfile("fedora", "fedora-38") diff --git a/tests/vm/centos b/tests/vm/centos index 097a9ca14d..d25c8f8b5b 100755 --- a/tests/vm/centos +++ b/tests/vm/centos @@ -26,8 +26,8 @@ class CentosVM(basevm.BaseVM): export SRC_ARCHIVE=3D/dev/vdb; sudo chmod a+r $SRC_ARCHIVE; tar -xf $SRC_ARCHIVE; - make docker-test-block@centos8 {verbose} J=3D{jobs} NETWORK=3D1; - make docker-test-quick@centos8 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-block@centos9 {verbose} J=3D{jobs} NETWORK=3D1; + make docker-test-quick@centos9 {verbose} J=3D{jobs} NETWORK=3D1; """ =20 def build_image(self, img): --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634925; cv=none; d=zohomail.com; s=zohoarc; b=RJjEkG9gC6l6LsImu+HcQA8breN049tAfq4QWnSrAkYaPlIUQXEGkBqriU4KvUshNKLy7GmwfBfES33fUYKmzoghwNLPWhxBtUd6mtYNw/+T92q2LU5AkZbjOeimQErO+Rj9ONFSfw+NmE2F14ApOogC9m0jmCecbzm/EIgY/r8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634925; 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=9HmnkEi4Xrv5p3rnmEdYqUcU4Qbghf77Z/RDogMW1HU=; b=MrhDO+Uhi58Fi6y4hA0rRWp9H3JKYtHGw25QKyFq6Lhwr7dgTyj2cMXi0ZAwVvrS5+qdM8irIt/qE/Hhlb22bSa0wfLpO0+GSTHYChZTZzyUD3rBDzBtNawJYDvEtOUiw+SYF8JD8NQ6BBxrclXWWcX5Z/+lFuhjLoy6B7q66ss= 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+importer2=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 1711634925865322.072935218303; Thu, 28 Mar 2024 07:08:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPE-0004MV-9q; Thu, 28 Mar 2024 10:07:00 -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 1rpqPC-0004J4-Rr for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:58 -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 1rpqP9-0004Pc-Il for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:58 -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-382-PVql2vj0ODqwHMZSz62Vxg-1; Thu, 28 Mar 2024 10:06:51 -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 865211C54068; Thu, 28 Mar 2024 14:06:48 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 35AC440C6DB7; Thu, 28 Mar 2024 14:06:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634814; 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=9HmnkEi4Xrv5p3rnmEdYqUcU4Qbghf77Z/RDogMW1HU=; b=Tkijz9RJ6an725z47mNJ76PEGfaWV9XpQBx6IdXLnqCNFJuMZh76idkK9+KIShZuQQKLIK oAT8e7k4Esb6qzJ1jcdWmxw8GOxIHwmgBKEE0LFAAIw1Nssc7DquCtVcRSmp4XV205BZPy QhOO37IHUAbj6XNLC0O0HzcznvkAf9g= X-MC-Unique: PVql2vj0ODqwHMZSz62Vxg-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 4/9] Bump minimum glib version to v2.66 Date: Thu, 28 Mar 2024 15:06:01 +0100 Message-ID: <20240328140607.2433889-5-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+importer2=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: -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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634926496100001 Content-Type: text/plain; charset="utf-8" Now that we dropped support for CentOS 8 and Ubuntu 20.04, we can look into bumping the glib version to a new minimum for further clean-ups. According to repology.org, available versions are: CentOS Stream 9: 2.66.7 Debian 11: 2.66.8 Fedora 38: 2.74.1 Freebsd: 2.78.4 Homebrew: 2.80.0 Openbsd: 2.78.4 OpenSuse leap 15.5: 2.70.5 pkgsrc_current: 2.78.4 Ubuntu 22.04: 2.72.1 Thus it should be safe to bump the minimum glib version to 2.66 now. Version 2.66 comes with new functions for URI parsing which will allow further clean-ups in the following patches. Signed-off-by: Thomas Huth --- meson.build | 16 +--------------- include/glib-compat.h | 27 ++------------------------- qga/commands-posix-ssh.c | 4 ++-- 3 files changed, 5 insertions(+), 42 deletions(-) diff --git a/meson.build b/meson.build index c9c3217ba4..c0aaceffc0 100644 --- a/meson.build +++ b/meson.build @@ -865,7 +865,7 @@ have_xen_pci_passthrough =3D get_option('xen_pci_passth= rough') \ =20 # When bumping glib minimum version, please check also whether to increase # the _WIN32_WINNT setting in osdep.h according to the value from glib -glib_req_ver =3D '>=3D2.56.0' +glib_req_ver =3D '>=3D2.66.0' glib_pc =3D dependency('glib-2.0', version: glib_req_ver, required: true, method: 'pkg-config') glib_cflags =3D [] @@ -906,20 +906,6 @@ if not cc.compiles(''' to the right pkg-config files for your build target.''') endif =20 -# Silence clang warnings triggered by glib < 2.57.2 -if not cc.compiles(''' - #include - typedef struct Foo { - int i; - } Foo; - static void foo_free(Foo *f) - { - g_free(f); - } - G_DEFINE_AUTOPTR_CLEANUP_FUNC(Foo, foo_free) - int main(void) { return 0; }''', dependencies: glib_pc, args: ['-Wunused= -function', '-Werror']) - glib_cflags +=3D cc.get_supported_arguments('-Wno-unused-function') -endif glib =3D declare_dependency(dependencies: [glib_pc, gmodule], compile_args: glib_cflags, version: glib_pc.version()) diff --git a/include/glib-compat.h b/include/glib-compat.h index 43a562974d..86be439ba0 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -19,12 +19,12 @@ /* Ask for warnings for anything that was marked deprecated in * the defined version, or before. It is a candidate for rewrite. */ -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56 +#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_66 =20 /* Ask for warnings if code tries to use function that did not * exist in the defined version. These risk breaking builds */ -#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56 +#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_66 =20 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -105,29 +105,6 @@ static inline gpointer g_memdup2_qemu(gconstpointer me= m, gsize byte_size) } #define g_memdup2(m, s) g_memdup2_qemu(m, s) =20 -#if defined(G_OS_UNIX) -/* - * Note: The fallback implementation is not MT-safe, and it returns a copy= of - * the libc passwd (must be g_free() after use) but not the content. Becau= se of - * these important differences the caller must be aware of, it's not #defi= ne for - * GLib API substitution. - */ -static inline struct passwd * -g_unix_get_passwd_entry_qemu(const gchar *user_name, GError **error) -{ -#if GLIB_CHECK_VERSION(2, 64, 0) - return g_unix_get_passwd_entry(user_name, error); -#else - struct passwd *p =3D getpwnam(user_name); - if (!p) { - g_set_error_literal(error, G_UNIX_ERROR, 0, g_strerror(errno)); - return NULL; - } - return (struct passwd *)g_memdup(p, sizeof(*p)); -#endif -} -#endif /* G_OS_UNIX */ - static inline bool qemu_g_test_slow(void) { diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c index 236f80de44..b0e0b1d674 100644 --- a/qga/commands-posix-ssh.c +++ b/qga/commands-posix-ssh.c @@ -35,7 +35,7 @@ test_get_passwd_entry(const gchar *user_name, GError **er= ror) return p; } =20 -#define g_unix_get_passwd_entry_qemu(username, err) \ +#define g_unix_get_passwd_entry(username, err) \ test_get_passwd_entry(username, err) #endif =20 @@ -45,7 +45,7 @@ get_passwd_entry(const char *username, Error **errp) g_autoptr(GError) err =3D NULL; struct passwd *p; =20 - p =3D g_unix_get_passwd_entry_qemu(username, &err); + p =3D g_unix_get_passwd_entry(username, &err); if (p =3D=3D NULL) { error_setg(errp, "failed to lookup user '%s': %s", username, err->message); --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634903; cv=none; d=zohomail.com; s=zohoarc; b=HG/e2KxxJ1YsNwgxfA97CaEYUFoek0y5frIb/rOQHnizR/176OYg/oEBQvnho75WJvyf3dLiLF6+Rx5qLXY2qBfnM+F/ICQ50pyeTMJaoZuVqn+1k/Wj4OAHR3j+IkE98i0VcXCJriZjKk9A6mbqrNp4WvgbPaYeQlKkqpCfMTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634903; 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=7yB8tI5IT+BaEhv+XsYrzMuoYNTEs+U+d75tB8UncSU=; b=D8LilL6Rj3R/RFxHwrAhXo1sQiYO6BHWpWFE/t9KaXtcb41MuXp8/u48eAY1k4GIBlI9KNdDwA0EVnwEghzPeETL2MrGn5+kGAtu+o+BK8L8FaPLcDwg8yIz8DPH6L/ye8Gv5olfhcAgMk6HfCg7Qg2RddXbD4r4azV3tfkAKmc= 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+importer2=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 1711634903745204.99875042010626; Thu, 28 Mar 2024 07:08:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPE-0004Ns-V6; Thu, 28 Mar 2024 10:07:00 -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 1rpqPC-0004JB-TQ for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:58 -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 1rpqPB-0004RT-5V for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:06:58 -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-602-zmAJMaL7MaK_LMoOc3p-dw-1; Thu, 28 Mar 2024 10:06:51 -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 E98B31C54074; Thu, 28 Mar 2024 14:06:50 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA59240C6CB5; Thu, 28 Mar 2024 14:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634816; 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=7yB8tI5IT+BaEhv+XsYrzMuoYNTEs+U+d75tB8UncSU=; b=jWh4tiED9ylYLdt8B8c0ZwuV2MUr2uBE59/t39QPKAc5UUPG9MK10fQBELqXr+MAFKI/tL 3EAKYz+Nyhof9N8Z9uAKhpSdEhsuAPp/iBHOY1KykcKqCZZ5+274czy44bQ2mSNk9fPeVg Rc/9M+BdniYxHy92JUhy8LxQF/ul8RU= X-MC-Unique: zmAJMaL7MaK_LMoOc3p-dw-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 5/9] block/gluster: Use URI parsing code from glib Date: Thu, 28 Mar 2024 15:06:02 +0100 Message-ID: <20240328140607.2433889-6-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+importer2=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: -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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634904646100001 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. Cc: integration@gluster.org Signed-off-by: Thomas Huth --- block/gluster.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index cc74af06dc..f4cb95360e 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; @@ -350,12 +349,15 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, const char *filename) { SocketAddress *gsconf; - URI *uri; - QueryParams *qp =3D NULL; + GUri *uri; + GHashTable *qp =3D NULL; + int qp_n; bool is_unix =3D false; int ret =3D 0; + 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; } @@ -364,14 +366,15 @@ 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 { @@ -379,31 +382,39 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGlus= ter *gconf, goto out; } =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; } =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; - } - - if (is_unix) { - if (uri->server || uri->port) { + 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; } - if (strcmp(qp->p[0].name, "socket")) { + } + + uri_server =3D g_uri_get_host(uri); + uri_port =3D g_uri_get_port(uri); + + if (is_unix) { + char *uri_socket =3D g_hash_table_lookup(qp, "socket"); + if (uri_server || uri_port !=3D -1 || !uri_socket) { ret =3D -EINVAL; goto out; } - 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 !=3D -1) { + gsconf->u.inet.port =3D g_strdup_printf("%d", uri_port); } else { gsconf->u.inet.port =3D g_strdup_printf("%d", GLUSTER_DEFAULT_= PORT); } @@ -411,9 +422,9 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluste= r *gconf, =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 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=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=MiX2mtuGR6MQwvf4jeMWI6qxS6f0eFgWG5fMZCyg9PycEP/bxcGs8FcOyZJE1xW8EdwzgjTS2zcXKNQ3mozq9osh9/2m9NdpIYNl6YyOwpj/oRZ8IxK9YC1X6nyNSdA9iv5NTxRBFMtTAg5PDjAY1edJ16A9nvI4/iy+AOKEOp8= 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=BGwbcdr9fd9hu9N/IcltCuSxEmXcz/+h4ZyUdIM5GmeFSsz3YPpqOisB4E/benalJswiGdWqyy9YAgwHMcDXUlra8Rr+OpJVPfyZxI6tcBxz9RWQ7zdTZUxZs4C/g1hBaWx27SJPf8vy8wDHF6fOocXvzKQS6uHSRzQRm09aDl8= 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+importer2=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 1711634935224713.0978222708762; 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+importer2=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634936460100001 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 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634950; cv=none; d=zohomail.com; s=zohoarc; b=UOgM+7ZnOccFpuMhgQR/EurnxUqVCZxkJtvySNQVxLBTtHp9yTXGqGjCsEXBDs/T6qyQguhlCtbRcJ1B6PnzhDE/fBTzBtxP5AHSVxllUI1kMERXwJ9ZiSxbBFt0z5Myemxuj1ronfvKjsriCGi5+ATlLxwYE72/vksN1O4qwgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634950; 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=sKqmndWMAoOQqexnPlnfmFTebfzYa9qZgU+l9FrXdws=; b=CGJ/WUPx9d0afBJCrcNRxr6Oap+WDlUNO37CkByZ45EZtzZUncz8Ii8A1nPRr5gI94uVO+rp5zvZEkuFwuGDi14nVse5hDMbQfM0q4eIJFXnBM5I6yuIC9WXQucgkitQnTL048U3pE7xPMapNZ5RECte6N0Av/MrxeLGytvSRwg= 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+importer2=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 1711634949998867.6992051241696; Thu, 28 Mar 2024 07:09:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPH-0004Po-BZ; Thu, 28 Mar 2024 10:07:03 -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 1rpqPF-0004OJ-B1 for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:01 -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 1rpqPD-0004TW-Ga for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:01 -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-209-MENvF9mHMNS2L9_8IgYs6A-1; Thu, 28 Mar 2024 10:06:57 -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 C928280190F; Thu, 28 Mar 2024 14:06:56 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD9A240C6CB8; Thu, 28 Mar 2024 14:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634818; 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=sKqmndWMAoOQqexnPlnfmFTebfzYa9qZgU+l9FrXdws=; b=JxUBZ3VXaWuMJvQNbCVlCBlcZa+sRUxFxiemdr4iASgrtelKtz/MZIb6cUBtj+w6ELKhsr icDg+Q1EDgSVJflDC7XCht6ircP1J2PGVU7jhtlOaX7Pa3YkOdN1mnBNx0CvfbrwOKBxCg p3/fBW+81YDCaotPfgsSVg1s4+//qZ0= X-MC-Unique: MENvF9mHMNS2L9_8IgYs6A-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 7/9] block/nfs: Use URI parsing code from glib Date: Thu, 28 Mar 2024 15:06:04 +0100 Message-ID: <20240328140607.2433889-8-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+importer2=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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634950532100001 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. Signed-off-by: Thomas Huth --- block/nfs.c | 102 ++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index f737e19cd3..9550063695 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -38,7 +38,6 @@ #include "qemu/main-loop.h" #include "qemu/module.h" #include "qemu/option.h" -#include "qemu/uri.h" #include "qemu/cutils.h" #include "sysemu/replay.h" #include "qapi/qapi-visit-block-core.h" @@ -79,76 +78,79 @@ typedef struct NFSRPC { =20 static int nfs_parse_uri(const char *filename, QDict *options, Error **err= p) { - URI *uri =3D NULL; - QueryParams *qp =3D NULL; - int ret =3D -EINVAL, i; - - uri =3D uri_parse(filename); + GUri *uri; + GUriParamsIter qp; + const char *uri_server, *uri_path, *uri_query; + char *qp_name, *qp_value; + GError *gerror =3D NULL; + int ret =3D -EINVAL; + + uri =3D g_uri_parse(filename, G_URI_FLAGS_NONE, NULL); if (!uri) { error_setg(errp, "Invalid URI specified"); goto out; } - if (g_strcmp0(uri->scheme, "nfs") !=3D 0) { + if (!g_str_equal(g_uri_get_scheme(uri), "nfs")) { error_setg(errp, "URI scheme must be 'nfs'"); goto out; } =20 - if (!uri->server) { + uri_server =3D g_uri_get_host(uri); + if (!uri_server || !uri_server[0]) { error_setg(errp, "missing hostname in URI"); goto out; } =20 - if (!uri->path) { + uri_path =3D g_uri_get_path(uri); + if (!uri_path || !uri_path[0]) { error_setg(errp, "missing file path in URI"); goto out; } =20 - qp =3D query_params_parse(uri->query); - if (!qp) { - error_setg(errp, "could not parse query parameters"); - goto out; - } - - qdict_put_str(options, "server.host", uri->server); + qdict_put_str(options, "server.host", uri_server); qdict_put_str(options, "server.type", "inet"); - qdict_put_str(options, "path", uri->path); - - for (i =3D 0; i < qp->n; i++) { - uint64_t val; - if (!qp->p[i].value) { - error_setg(errp, "Value for NFS parameter expected: %s", - qp->p[i].name); - goto out; - } - if (parse_uint_full(qp->p[i].value, 0, &val)) { - error_setg(errp, "Illegal value for NFS parameter: %s", - qp->p[i].name); - goto out; - } - if (!strcmp(qp->p[i].name, "uid")) { - qdict_put_str(options, "user", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "gid")) { - qdict_put_str(options, "group", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "tcp-syncnt")) { - qdict_put_str(options, "tcp-syn-count", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "readahead")) { - qdict_put_str(options, "readahead-size", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "pagecache")) { - qdict_put_str(options, "page-cache-size", qp->p[i].value); - } else if (!strcmp(qp->p[i].name, "debug")) { - qdict_put_str(options, "debug", qp->p[i].value); - } else { - error_setg(errp, "Unknown NFS parameter name: %s", - qp->p[i].name); - goto out; + qdict_put_str(options, "path", uri_path); + + uri_query =3D g_uri_get_query(uri); + if (uri_query) { + g_uri_params_iter_init(&qp, uri_query, -1, "&", G_URI_PARAMS_NONE); + while (g_uri_params_iter_next(&qp, &qp_name, &qp_value, &gerror)) { + uint64_t val; + if (!qp_name || gerror) { + error_setg(errp, "Failed to parse NFS parameter"); + goto out; + } + if (!qp_value) { + error_setg(errp, "Value for NFS parameter expected: %s", + qp_name); + goto out; + } + if (parse_uint_full(qp_value, 0, &val)) { + error_setg(errp, "Illegal value for NFS parameter: %s", + qp_name); + goto out; + } + if (g_str_equal(qp_name, "uid")) { + qdict_put_str(options, "user", qp_value); + } else if (g_str_equal(qp_name, "gid")) { + qdict_put_str(options, "group", qp_value); + } else if (g_str_equal(qp_name, "tcp-syncnt")) { + qdict_put_str(options, "tcp-syn-count", qp_value); + } else if (g_str_equal(qp_name, "readahead")) { + qdict_put_str(options, "readahead-size", qp_value); + } else if (g_str_equal(qp_name, "pagecache")) { + qdict_put_str(options, "page-cache-size", qp_value); + } else if (g_str_equal(qp_name, "debug")) { + qdict_put_str(options, "debug", qp_value); + } else { + error_setg(errp, "Unknown NFS parameter name: %s", qp_name= ); + goto out; + } } } ret =3D 0; out: - if (qp) { - query_params_free(qp); - } - uri_free(uri); + g_uri_unref(uri); return ret; } =20 --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634949; cv=none; d=zohomail.com; s=zohoarc; b=OH88GZk8l9kRBhX4xDIck+dVI0NAMcGwsXhUhgCEP7FCBb8b0ggsiEt1K4mJmPraIb3VltJjvWoDtiZAFZJlqMYVWz3gcoptSkKC4gp2RKnhuMnPAiOo4jDVZ8hfr/WTj9oAfUMT0r/U3ImYt3ZtGI31YDQpMe1YNfkj2QEyyU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634949; 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=lQl/iLmyzdImjhkre1nSNNpEIcN6Yjh2+vCRj5/BU7M=; b=fHiwwTERcrfOZhEK4GKNoNQyOlBfJ7q/EbPzkQ0JGn+wqDLpze/pbkiHsU915F+c503J7+uxvrodwU79L84aTurbIB144irN5ULNT1uYpdFBitcTWIlnHfjbaxMoKCwIXA1hweXFhUY8X0Aw/d5uBTGyn3Wm6p35MXQN2fYAigs= 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+importer2=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 1711634949955806.3214955876414; Thu, 28 Mar 2024 07:09:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPN-0004XU-TE; Thu, 28 Mar 2024 10:07:10 -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 1rpqPM-0004V9-UE for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:08 -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 1rpqPK-0004Wb-Pc for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:08 -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-646-zYrCZ3lAP5aa_pwg6QdMfg-1; Thu, 28 Mar 2024 10:07:01 -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 B911785A58B; Thu, 28 Mar 2024 14:06:59 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 267DB40C6CB1; Thu, 28 Mar 2024 14:06:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634825; 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=lQl/iLmyzdImjhkre1nSNNpEIcN6Yjh2+vCRj5/BU7M=; b=U2mGWZp2g2pDoxOb8e0psBtV3KULuSTNLipAzBxSRXPY7TUEKvv+QdqqY4AU1MxdDm8WST AWk194gwW2FiM6TUNYvTonRwKqXri+XItQc8v8heyCuDqGJ9FRrWp/CIDp4F3p5pGZbz0V NQBXOX0HywHP1sZjwTCcAUWnqmExZVY= X-MC-Unique: zYrCZ3lAP5aa_pwg6QdMfg-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 8/9] block/ssh: Use URI parsing code from glib Date: Thu, 28 Mar 2024 15:06:05 +0100 Message-ID: <20240328140607.2433889-9-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+importer2=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: -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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634950534100002 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. Signed-off-by: Thomas Huth Reviewed-by: Richard W.M. Jones --- block/ssh.c | 69 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 2748253d4a..c0caf59793 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -37,7 +37,6 @@ #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h" -#include "qemu/uri.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/qmp/qdict.h" @@ -181,64 +180,76 @@ static void sftp_error_trace(BDRVSSHState *s, const c= har *op) =20 static int parse_uri(const char *filename, QDict *options, Error **errp) { - URI *uri =3D NULL; - QueryParams *qp; + GUri *uri; + const char *uri_host, *uri_path, *uri_user, *uri_query; char *port_str; - int i; + int port; + g_autoptr(GError) gerror =3D NULL; + char *qp_name, *qp_value; + GUriParamsIter qp; =20 - uri =3D uri_parse(filename); + uri =3D g_uri_parse(filename, G_URI_FLAGS_NONE, NULL); if (!uri) { return -EINVAL; } =20 - if (g_strcmp0(uri->scheme, "ssh") !=3D 0) { + if (g_strcmp0(g_uri_get_scheme(uri), "ssh") !=3D 0) { error_setg(errp, "URI scheme must be 'ssh'"); goto err; } =20 - if (!uri->server || strcmp(uri->server, "") =3D=3D 0) { + uri_host =3D g_uri_get_host(uri); + if (!uri_host || g_str_equal(uri_host, "")) { error_setg(errp, "missing hostname in URI"); goto err; } =20 - if (!uri->path || strcmp(uri->path, "") =3D=3D 0) { + uri_path =3D g_uri_get_path(uri); + if (!uri_path || g_str_equal(uri_path, "")) { error_setg(errp, "missing remote path in URI"); goto err; } =20 - qp =3D query_params_parse(uri->query); - if (!qp) { - error_setg(errp, "could not parse query parameters"); - goto err; - } - - if(uri->user && strcmp(uri->user, "") !=3D 0) { - qdict_put_str(options, "user", uri->user); + uri_user =3D g_uri_get_user(uri); + if (uri_user && !g_str_equal(uri_user, "")) { + qdict_put_str(options, "user", uri_user); } =20 - qdict_put_str(options, "server.host", uri->server); + qdict_put_str(options, "server.host", uri_host); =20 - port_str =3D g_strdup_printf("%d", uri->port ?: 22); + port =3D g_uri_get_port(uri); + port_str =3D g_strdup_printf("%d", port !=3D -1 ? port : 22); qdict_put_str(options, "server.port", port_str); g_free(port_str); =20 - qdict_put_str(options, "path", uri->path); - - /* Pick out any query parameters that we understand, and ignore - * the rest. - */ - for (i =3D 0; i < qp->n; ++i) { - if (strcmp(qp->p[i].name, "host_key_check") =3D=3D 0) { - qdict_put_str(options, "host_key_check", qp->p[i].value); + qdict_put_str(options, "path", uri_path); + + uri_query =3D g_uri_get_query(uri); + if (uri_query) { + g_uri_params_iter_init(&qp, uri_query, -1, "&", G_URI_PARAMS_NONE); + while (g_uri_params_iter_next(&qp, &qp_name, &qp_value, &gerror)) { + if (!qp_name || !qp_value || gerror) { + warn_report("Failed to parse SSH URI parameters '%s'.", + uri_query); + break; + } + /* + * Pick out the query parameters that we understand, and ignore + * (or rather warn about) the rest. + */ + if (g_str_equal(qp_name, "host_key_check")) { + qdict_put_str(options, "host_key_check", qp_value); + } else { + warn_report("Unsupported parameter '%s' in URI.", qp_name); + } } } =20 - query_params_free(qp); - uri_free(uri); + g_uri_unref(uri); return 0; =20 err: - uri_free(uri); + g_uri_unref(uri); return -EINVAL; } =20 --=20 2.44.0 From nobody Fri May 17 04:15:50 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1711634930; cv=none; d=zohomail.com; s=zohoarc; b=kk4Ni8azaw/S0D1ACItV+U2LWgtsy5N4u7RRu4+hGBPLm1lhk0AS0cLk1Y6ywhDMOe67fhANQXgUE4C6FsH0jvaTqY25smoSRo11GcFup4r3UHoiYn4sEHFtn8lL46UYwofSRR/3qAUgRmhdQR4HKPSeMIx8hr8kUdwJwMYUijY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1711634930; 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=pQ+GrcY5slg1mROMClWy0f6G4waIRo2WwUNIKlMC3Qk=; b=hWY6oBwaeDlHrUOiaUS0nlZAWePaIteyq16FrX4oOmgjvbGz8RuADSdwyVZVO4Jzo+nuMrtD+XA4I65erLCOFw0jp3zLd7tj5JTF2hwt8YtIjWE4bxeAMJeFSjH08I0tHytHbvZOYCTnNt/Q2pwkwcqEiPCg+qe6imafwFmsyeA= 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+importer2=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 1711634930220169.24492554921198; Thu, 28 Mar 2024 07:08:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpqPT-0004nP-4n; Thu, 28 Mar 2024 10:07:15 -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 1rpqPR-0004hh-GE for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:13 -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 1rpqPN-0004Ya-6X for qemu-devel@nongnu.org; Thu, 28 Mar 2024 10:07:13 -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-595-ARTP-apjM8WFHlpEFWGxdA-1; Thu, 28 Mar 2024 10:07:05 -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 0E5B728B6AAD; Thu, 28 Mar 2024 14:07:04 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.193.161]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12AFD40C6CB1; Thu, 28 Mar 2024 14:06:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711634828; 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=pQ+GrcY5slg1mROMClWy0f6G4waIRo2WwUNIKlMC3Qk=; b=BGI5YtjHbxZGRzYNlFjgf+gqULOXZnJg8WGTyiGYprJvpk/25GtrZtvJKYqn0sj++xIliC dA4+joepr5HbGbV1uEaMfsIhC3r2Ghg0T4cFb+Lxx+ulJf/5YPSPckBs/7hovVpUVcL0jM k/Et6mCib3bClhCosICPIKO8anCkrig= X-MC-Unique: ARTP-apjM8WFHlpEFWGxdA-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 9/9] util/uri: Remove the old URI parsing code Date: Thu, 28 Mar 2024 15:06:06 +0100 Message-ID: <20240328140607.2433889-10-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+importer2=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=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1711634930727100009 Content-Type: text/plain; charset="utf-8" Now that we switched all consumers of the URI code to use the URI parsing functions from glib instead, we can remove our internal URI parsing code since it is not used anymore. Signed-off-by: Thomas Huth --- include/qemu/uri.h | 99 --- util/uri.c | 1466 -------------------------------------------- util/meson.build | 2 +- 3 files changed, 1 insertion(+), 1566 deletions(-) delete mode 100644 include/qemu/uri.h delete mode 100644 util/uri.c diff --git a/include/qemu/uri.h b/include/qemu/uri.h deleted file mode 100644 index 255e61f452..0000000000 --- a/include/qemu/uri.h +++ /dev/null @@ -1,99 +0,0 @@ -/** - * Summary: library of generic URI related routines - * Description: library of generic URI related routines - * Implements RFC 2396 - * - * Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHAL= L THE - * DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WH= ETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA= RE. - * - * Except as contained in this notice, the name of Daniel Veillard shall n= ot - * be used in advertising or otherwise to promote the sale, use or other - * dealings in this Software without prior written authorization from him. - * - * Author: Daniel Veillard - ** - * Copyright (C) 2007 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Authors: - * Richard W.M. Jones - * - * Utility functions to help parse and assemble query strings. - */ - -#ifndef QEMU_URI_H -#define QEMU_URI_H - -/** - * URI: - * - * A parsed URI reference. This is a struct containing the various fields - * as described in RFC 2396 but separated for further processing. - */ -typedef struct URI { - char *scheme; /* the URI scheme */ - char *opaque; /* opaque part */ - char *authority; /* the authority part */ - char *server; /* the server part */ - char *user; /* the user part */ - int port; /* the port number */ - char *path; /* the path string */ - char *fragment; /* the fragment identifier */ - int cleanup; /* parsing potentially unclean URI */ - char *query; /* the query string (as it appears in the URI) */ -} URI; - -URI *uri_new(void); -URI *uri_parse(const char *str); -URI *uri_parse_raw(const char *str, int raw); -int uri_parse_into(URI *uri, const char *str); -char *uri_to_string(URI *uri); -void uri_free(URI *uri); - -/* Single web service query parameter 'name=3Dvalue'. */ -typedef struct QueryParam { - char *name; /* Name (unescaped). */ - char *value; /* Value (unescaped). */ - int ignore; /* Ignore this field in qparam_get_query */ -} QueryParam; - -/* Set of parameters. */ -typedef struct QueryParams { - int n; /* number of parameters used */ - int alloc; /* allocated space */ - QueryParam *p; /* array of parameters */ -} QueryParams; - -QueryParams *query_params_new(int init_alloc); -QueryParams *query_params_parse(const char *query); -void query_params_free(QueryParams *ps); - -#endif /* QEMU_URI_H */ diff --git a/util/uri.c b/util/uri.c deleted file mode 100644 index 573174bf47..0000000000 --- a/util/uri.c +++ /dev/null @@ -1,1466 +0,0 @@ -/** - * uri.c: set of generic URI related routines - * - * Reference: RFCs 3986, 2732 and 2373 - * - * Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHAL= L THE - * DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WH= ETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA= RE. - * - * Except as contained in this notice, the name of Daniel Veillard shall n= ot - * be used in advertising or otherwise to promote the sale, use or other - * dealings in this Software without prior written authorization from him. - * - * daniel@veillard.com - * - ** - * - * Copyright (C) 2007, 2009-2010 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Authors: - * Richard W.M. Jones - * - */ - -#include "qemu/osdep.h" -#include "qemu/cutils.h" - -#include "qemu/uri.h" - -static void uri_clean(URI *uri); - -/* - * Old rule from 2396 used in legacy handling code - * alpha =3D lowalpha | upalpha - */ -#define IS_ALPHA(x) (IS_LOWALPHA(x) || IS_UPALPHA(x)) - -/* - * lowalpha =3D "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | - * "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" | - * "u" | "v" | "w" | "x" | "y" | "z" - */ - -#define IS_LOWALPHA(x) (((x) >=3D 'a') && ((x) <=3D 'z')) - -/* - * upalpha =3D "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | "J" | - * "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | "S" | "T" | - * "U" | "V" | "W" | "X" | "Y" | "Z" - */ -#define IS_UPALPHA(x) (((x) >=3D 'A') && ((x) <=3D 'Z')) - -#ifdef IS_DIGIT -#undef IS_DIGIT -#endif -/* - * digit =3D "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" - */ -#define IS_DIGIT(x) (((x) >=3D '0') && ((x) <=3D '9')) - -/* - * alphanum =3D alpha | digit - */ - -#define IS_ALPHANUM(x) (IS_ALPHA(x) || IS_DIGIT(x)) - -/* - * mark =3D "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")" - */ - -#define IS_MARK(x) (((x) =3D=3D '-') || ((x) =3D=3D '_') || ((x) =3D=3D '.= ') || \ - ((x) =3D=3D '!') || ((x) =3D=3D '~') || ((x) =3D=3D '*') || ((x) =3D= =3D '\'') || \ - ((x) =3D=3D '(') || ((x) =3D=3D ')')) - -/* - * unwise =3D "{" | "}" | "|" | "\" | "^" | "`" - */ - -#define IS_UNWISE(p) = \ - (((*(p) =3D=3D '{')) || ((*(p) =3D=3D '}')) || ((*(p) =3D=3D '|')) || = \ - ((*(p) =3D=3D '\\')) || ((*(p) =3D=3D '^')) || ((*(p) =3D=3D '[')) ||= \ - ((*(p) =3D=3D ']')) || ((*(p) =3D=3D '`'))) -/* - * reserved =3D ";" | "/" | "?" | ":" | "@" | "&" | "=3D" | "+" | "$" | ",= " | - * "[" | "]" - */ - -#define IS_RESERVED(x) (((x) =3D=3D ';') || ((x) =3D=3D '/') || ((x) =3D= =3D '?') || \ - ((x) =3D=3D ':') || ((x) =3D=3D '@') || ((x) =3D=3D '&') || ((x) =3D= =3D '=3D') || \ - ((x) =3D=3D '+') || ((x) =3D=3D '$') || ((x) =3D=3D ',') || ((x) =3D= =3D '[') || \ - ((x) =3D=3D ']')) - -/* - * unreserved =3D alphanum | mark - */ - -#define IS_UNRESERVED(x) (IS_ALPHANUM(x) || IS_MARK(x)) - -/* - * Skip to next pointer char, handle escaped sequences - */ - -#define NEXT(p) ((*p =3D=3D '%') ? p +=3D 3 : p++) - -/* - * Productions from the spec. - * - * authority =3D server | reg_name - * reg_name =3D 1*( unreserved | escaped | "$" | "," | - * ";" | ":" | "@" | "&" | "=3D" | "+" ) - * - * path =3D [ abs_path | opaque_part ] - */ - -/************************************************************************ - * * - * RFC 3986 parser * - * * - ************************************************************************/ - -#define ISA_DIGIT(p) ((*(p) >=3D '0') && (*(p) <=3D '9')) -#define ISA_ALPHA(p) (((*(p) >=3D 'a') && (*(p) <=3D 'z')) || = \ - ((*(p) >=3D 'A') && (*(p) <=3D 'Z'))) -#define ISA_HEXDIG(p) = \ - (ISA_DIGIT(p) || ((*(p) >=3D 'a') && (*(p) <=3D 'f')) || = \ - ((*(p) >=3D 'A') && (*(p) <=3D 'F'))) - -/* - * sub-delims =3D "!" / "$" / "&" / "'" / "(" / ")" - * / "*" / "+" / "," / ";" / "=3D" - */ -#define ISA_SUB_DELIM(p) = \ - (((*(p) =3D=3D '!')) || ((*(p) =3D=3D '$')) || ((*(p) =3D=3D '&')) || = \ - ((*(p) =3D=3D '(')) || ((*(p) =3D=3D ')')) || ((*(p) =3D=3D '*')) || = \ - ((*(p) =3D=3D '+')) || ((*(p) =3D=3D ',')) || ((*(p) =3D=3D ';')) || = \ - ((*(p) =3D=3D '=3D')) || ((*(p) =3D=3D '\''))) - -/* - * unreserved =3D ALPHA / DIGIT / "-" / "." / "_" / "~" - */ -#define ISA_UNRESERVED(p) = \ - ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) =3D=3D '-')) || = \ - ((*(p) =3D=3D '.')) || ((*(p) =3D=3D '_')) || ((*(p) =3D=3D '~'))) - -/* - * pct-encoded =3D "%" HEXDIG HEXDIG - */ -#define ISA_PCT_ENCODED(p) = \ - ((*(p) =3D=3D '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2))) - -/* - * pchar =3D unreserved / pct-encoded / sub-delims / ":" / "@" - */ -#define ISA_PCHAR(p) = \ - (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) || = \ - ((*(p) =3D=3D ':')) || ((*(p) =3D=3D '@'))) - -/** - * rfc3986_parse_scheme: - * @uri: pointer to an URI structure - * @str: pointer to the string to analyze - * - * Parse an URI scheme - * - * ALPHA *( ALPHA / DIGIT / "+" / "-" / "." ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_scheme(URI *uri, const char **str) -{ - const char *cur; - - if (str =3D=3D NULL) { - return -1; - } - - cur =3D *str; - if (!ISA_ALPHA(cur)) { - return 2; - } - cur++; - while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur =3D=3D '+') || (*cur = =3D=3D '-') || - (*cur =3D=3D '.')) { - cur++; - } - if (uri !=3D NULL) { - g_free(uri->scheme); - uri->scheme =3D g_strndup(*str, cur - *str); - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_fragment: - * @uri: pointer to an URI structure - * @str: pointer to the string to analyze - * - * Parse the query part of an URI - * - * fragment =3D *( pchar / "/" / "?" ) - * NOTE: the strict syntax as defined by 3986 does not allow '[' and ']' - * in the fragment identifier but this is used very broadly for - * xpointer scheme selection, so we are allowing it here to not break - * for example all the DocBook processing chains. - * - * Returns 0 or the error code - */ -static int rfc3986_parse_fragment(URI *uri, const char **str) -{ - const char *cur; - - if (str =3D=3D NULL) { - return -1; - } - - cur =3D *str; - - while ((ISA_PCHAR(cur)) || (*cur =3D=3D '/') || (*cur =3D=3D '?') || - (*cur =3D=3D '[') || (*cur =3D=3D ']') || - ((uri !=3D NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) { - NEXT(cur); - } - if (uri !=3D NULL) { - g_free(uri->fragment); - if (uri->cleanup & 2) { - uri->fragment =3D g_strndup(*str, cur - *str); - } else { - uri->fragment =3D g_uri_unescape_segment(*str, cur, NULL); - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_query: - * @uri: pointer to an URI structure - * @str: pointer to the string to analyze - * - * Parse the query part of an URI - * - * query =3D *uric - * - * Returns 0 or the error code - */ -static int rfc3986_parse_query(URI *uri, const char **str) -{ - const char *cur; - - if (str =3D=3D NULL) { - return -1; - } - - cur =3D *str; - - while ((ISA_PCHAR(cur)) || (*cur =3D=3D '/') || (*cur =3D=3D '?') || - ((uri !=3D NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) { - NEXT(cur); - } - if (uri !=3D NULL) { - g_free(uri->query); - uri->query =3D g_strndup(*str, cur - *str); - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_port: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse a port part and fills in the appropriate fields - * of the @uri structure - * - * port =3D *DIGIT - * - * Returns 0 or the error code - */ -static int rfc3986_parse_port(URI *uri, const char **str) -{ - const char *cur =3D *str; - int port =3D 0; - - if (ISA_DIGIT(cur)) { - while (ISA_DIGIT(cur)) { - port =3D port * 10 + (*cur - '0'); - if (port > 65535) { - return 1; - } - cur++; - } - if (uri) { - uri->port =3D port; - } - *str =3D cur; - return 0; - } - return 1; -} - -/** - * rfc3986_parse_user_info: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse a user information part and fill in the appropriate fields - * of the @uri structure - * - * userinfo =3D *( unreserved / pct-encoded / sub-delims / ":" ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_user_info(URI *uri, const char **str) -{ - const char *cur; - - cur =3D *str; - while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cu= r) || - (*cur =3D=3D ':')) { - NEXT(cur); - } - if (*cur =3D=3D '@') { - if (uri !=3D NULL) { - g_free(uri->user); - if (uri->cleanup & 2) { - uri->user =3D g_strndup(*str, cur - *str); - } else { - uri->user =3D g_uri_unescape_segment(*str, cur, NULL); - } - } - *str =3D cur; - return 0; - } - return 1; -} - -/** - * rfc3986_parse_dec_octet: - * @str: the string to analyze - * - * dec-octet =3D DIGIT ; 0-9 - * / %x31-39 DIGIT ; 10-99 - * / "1" 2DIGIT ; 100-199 - * / "2" %x30-34 DIGIT ; 200-249 - * / "25" %x30-35 ; 250-255 - * - * Skip a dec-octet. - * - * Returns 0 if found and skipped, 1 otherwise - */ -static int rfc3986_parse_dec_octet(const char **str) -{ - const char *cur =3D *str; - - if (!(ISA_DIGIT(cur))) { - return 1; - } - if (!ISA_DIGIT(cur + 1)) { - cur++; - } else if ((*cur !=3D '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur = + 2))) { - cur +=3D 2; - } else if ((*cur =3D=3D '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur= + 2))) { - cur +=3D 3; - } else if ((*cur =3D=3D '2') && (*(cur + 1) >=3D '0') && (*(cur + 1) <= =3D '4') && - (ISA_DIGIT(cur + 2))) { - cur +=3D 3; - } else if ((*cur =3D=3D '2') && (*(cur + 1) =3D=3D '5') && (*(cur + 2)= >=3D '0') && - (*(cur + 1) <=3D '5')) { - cur +=3D 3; - } else { - return 1; - } - *str =3D cur; - return 0; -} -/** - * rfc3986_parse_host: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an host part and fills in the appropriate fields - * of the @uri structure - * - * host =3D IP-literal / IPv4address / reg-name - * IP-literal =3D "[" ( IPv6address / IPvFuture ) "]" - * IPv4address =3D dec-octet "." dec-octet "." dec-octet "." dec-octet - * reg-name =3D *( unreserved / pct-encoded / sub-delims ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_host(URI *uri, const char **str) -{ - const char *cur =3D *str; - const char *host; - - host =3D cur; - /* - * IPv6 and future addressing scheme are enclosed between brackets - */ - if (*cur =3D=3D '[') { - cur++; - while ((*cur !=3D ']') && (*cur !=3D 0)) { - cur++; - } - if (*cur !=3D ']') { - return 1; - } - cur++; - goto found; - } - /* - * try to parse an IPv4 - */ - if (ISA_DIGIT(cur)) { - if (rfc3986_parse_dec_octet(&cur) !=3D 0) { - goto not_ipv4; - } - if (*cur !=3D '.') { - goto not_ipv4; - } - cur++; - if (rfc3986_parse_dec_octet(&cur) !=3D 0) { - goto not_ipv4; - } - if (*cur !=3D '.') { - goto not_ipv4; - } - if (rfc3986_parse_dec_octet(&cur) !=3D 0) { - goto not_ipv4; - } - if (*cur !=3D '.') { - goto not_ipv4; - } - if (rfc3986_parse_dec_octet(&cur) !=3D 0) { - goto not_ipv4; - } - goto found; - not_ipv4: - cur =3D *str; - } - /* - * then this should be a hostname which can be empty - */ - while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cu= r)) { - NEXT(cur); - } -found: - if (uri !=3D NULL) { - g_free(uri->authority); - uri->authority =3D NULL; - g_free(uri->server); - if (cur !=3D host) { - if (uri->cleanup & 2) { - uri->server =3D g_strndup(host, cur - host); - } else { - uri->server =3D g_uri_unescape_segment(host, cur, NULL); - } - } else { - uri->server =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_authority: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an authority part and fills in the appropriate fields - * of the @uri structure - * - * authority =3D [ userinfo "@" ] host [ ":" port ] - * - * Returns 0 or the error code - */ -static int rfc3986_parse_authority(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - /* - * try to parse a userinfo and check for the trailing @ - */ - ret =3D rfc3986_parse_user_info(uri, &cur); - if ((ret !=3D 0) || (*cur !=3D '@')) { - cur =3D *str; - } else { - cur++; - } - ret =3D rfc3986_parse_host(uri, &cur); - if (ret !=3D 0) { - return ret; - } - if (*cur =3D=3D ':') { - cur++; - ret =3D rfc3986_parse_port(uri, &cur); - if (ret !=3D 0) { - return ret; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_segment: - * @str: the string to analyze - * @forbid: an optional forbidden character - * @empty: allow an empty segment - * - * Parse a segment and fills in the appropriate fields - * of the @uri structure - * - * segment =3D *pchar - * segment-nz =3D 1*pchar - * segment-nz-nc =3D 1*( unreserved / pct-encoded / sub-delims / "@" ) - * ; non-zero-length segment without any colon ":" - * - * Returns 0 or the error code - */ -static int rfc3986_parse_segment(const char **str, char forbid, int empty) -{ - const char *cur; - - cur =3D *str; - if (!ISA_PCHAR(cur)) { - if (empty) { - return 0; - } - return 1; - } - while (ISA_PCHAR(cur) && (*cur !=3D forbid)) { - NEXT(cur); - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_path_ab_empty: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an path absolute or empty and fills in the appropriate fields - * of the @uri structure - * - * path-abempty =3D *( "/" segment ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_path_ab_empty(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - - while (*cur =3D=3D '/') { - cur++; - ret =3D rfc3986_parse_segment(&cur, 0, 1); - if (ret !=3D 0) { - return ret; - } - } - if (uri !=3D NULL) { - g_free(uri->path); - if (*str !=3D cur) { - if (uri->cleanup & 2) { - uri->path =3D g_strndup(*str, cur - *str); - } else { - uri->path =3D g_uri_unescape_segment(*str, cur, NULL); - } - } else { - uri->path =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_path_absolute: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an path absolute and fills in the appropriate fields - * of the @uri structure - * - * path-absolute =3D "/" [ segment-nz *( "/" segment ) ] - * - * Returns 0 or the error code - */ -static int rfc3986_parse_path_absolute(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - - if (*cur !=3D '/') { - return 1; - } - cur++; - ret =3D rfc3986_parse_segment(&cur, 0, 0); - if (ret =3D=3D 0) { - while (*cur =3D=3D '/') { - cur++; - ret =3D rfc3986_parse_segment(&cur, 0, 1); - if (ret !=3D 0) { - return ret; - } - } - } - if (uri !=3D NULL) { - g_free(uri->path); - if (cur !=3D *str) { - if (uri->cleanup & 2) { - uri->path =3D g_strndup(*str, cur - *str); - } else { - uri->path =3D g_uri_unescape_segment(*str, cur, NULL); - } - } else { - uri->path =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_path_rootless: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an path without root and fills in the appropriate fields - * of the @uri structure - * - * path-rootless =3D segment-nz *( "/" segment ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_path_rootless(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - - ret =3D rfc3986_parse_segment(&cur, 0, 0); - if (ret !=3D 0) { - return ret; - } - while (*cur =3D=3D '/') { - cur++; - ret =3D rfc3986_parse_segment(&cur, 0, 1); - if (ret !=3D 0) { - return ret; - } - } - if (uri !=3D NULL) { - g_free(uri->path); - if (cur !=3D *str) { - if (uri->cleanup & 2) { - uri->path =3D g_strndup(*str, cur - *str); - } else { - uri->path =3D g_uri_unescape_segment(*str, cur, NULL); - } - } else { - uri->path =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_path_no_scheme: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an path which is not a scheme and fills in the appropriate fields - * of the @uri structure - * - * path-noscheme =3D segment-nz-nc *( "/" segment ) - * - * Returns 0 or the error code - */ -static int rfc3986_parse_path_no_scheme(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - - ret =3D rfc3986_parse_segment(&cur, ':', 0); - if (ret !=3D 0) { - return ret; - } - while (*cur =3D=3D '/') { - cur++; - ret =3D rfc3986_parse_segment(&cur, 0, 1); - if (ret !=3D 0) { - return ret; - } - } - if (uri !=3D NULL) { - g_free(uri->path); - if (cur !=3D *str) { - if (uri->cleanup & 2) { - uri->path =3D g_strndup(*str, cur - *str); - } else { - uri->path =3D g_uri_unescape_segment(*str, cur, NULL); - } - } else { - uri->path =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_hier_part: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an hierarchical part and fills in the appropriate fields - * of the @uri structure - * - * hier-part =3D "//" authority path-abempty - * / path-absolute - * / path-rootless - * / path-empty - * - * Returns 0 or the error code - */ -static int rfc3986_parse_hier_part(URI *uri, const char **str) -{ - const char *cur; - int ret; - - cur =3D *str; - - if ((*cur =3D=3D '/') && (*(cur + 1) =3D=3D '/')) { - cur +=3D 2; - ret =3D rfc3986_parse_authority(uri, &cur); - if (ret !=3D 0) { - return ret; - } - ret =3D rfc3986_parse_path_ab_empty(uri, &cur); - if (ret !=3D 0) { - return ret; - } - *str =3D cur; - return 0; - } else if (*cur =3D=3D '/') { - ret =3D rfc3986_parse_path_absolute(uri, &cur); - if (ret !=3D 0) { - return ret; - } - } else if (ISA_PCHAR(cur)) { - ret =3D rfc3986_parse_path_rootless(uri, &cur); - if (ret !=3D 0) { - return ret; - } - } else { - /* path-empty is effectively empty */ - if (uri !=3D NULL) { - g_free(uri->path); - uri->path =3D NULL; - } - } - *str =3D cur; - return 0; -} - -/** - * rfc3986_parse_relative_ref: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an URI string and fills in the appropriate fields - * of the @uri structure - * - * relative-ref =3D relative-part [ "?" query ] [ "#" fragment ] - * relative-part =3D "//" authority path-abempty - * / path-absolute - * / path-noscheme - * / path-empty - * - * Returns 0 or the error code - */ -static int rfc3986_parse_relative_ref(URI *uri, const char *str) -{ - int ret; - - if ((*str =3D=3D '/') && (*(str + 1) =3D=3D '/')) { - str +=3D 2; - ret =3D rfc3986_parse_authority(uri, &str); - if (ret !=3D 0) { - return ret; - } - ret =3D rfc3986_parse_path_ab_empty(uri, &str); - if (ret !=3D 0) { - return ret; - } - } else if (*str =3D=3D '/') { - ret =3D rfc3986_parse_path_absolute(uri, &str); - if (ret !=3D 0) { - return ret; - } - } else if (ISA_PCHAR(str)) { - ret =3D rfc3986_parse_path_no_scheme(uri, &str); - if (ret !=3D 0) { - return ret; - } - } else { - /* path-empty is effectively empty */ - if (uri !=3D NULL) { - g_free(uri->path); - uri->path =3D NULL; - } - } - - if (*str =3D=3D '?') { - str++; - ret =3D rfc3986_parse_query(uri, &str); - if (ret !=3D 0) { - return ret; - } - } - if (*str =3D=3D '#') { - str++; - ret =3D rfc3986_parse_fragment(uri, &str); - if (ret !=3D 0) { - return ret; - } - } - if (*str !=3D 0) { - uri_clean(uri); - return 1; - } - return 0; -} - -/** - * rfc3986_parse: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an URI string and fills in the appropriate fields - * of the @uri structure - * - * scheme ":" hier-part [ "?" query ] [ "#" fragment ] - * - * Returns 0 or the error code - */ -static int rfc3986_parse(URI *uri, const char *str) -{ - int ret; - - ret =3D rfc3986_parse_scheme(uri, &str); - if (ret !=3D 0) { - return ret; - } - if (*str !=3D ':') { - return 1; - } - str++; - ret =3D rfc3986_parse_hier_part(uri, &str); - if (ret !=3D 0) { - return ret; - } - if (*str =3D=3D '?') { - str++; - ret =3D rfc3986_parse_query(uri, &str); - if (ret !=3D 0) { - return ret; - } - } - if (*str =3D=3D '#') { - str++; - ret =3D rfc3986_parse_fragment(uri, &str); - if (ret !=3D 0) { - return ret; - } - } - if (*str !=3D 0) { - uri_clean(uri); - return 1; - } - return 0; -} - -/** - * rfc3986_parse_uri_reference: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an URI reference string and fills in the appropriate fields - * of the @uri structure - * - * URI-reference =3D URI / relative-ref - * - * Returns 0 or the error code - */ -static int rfc3986_parse_uri_reference(URI *uri, const char *str) -{ - int ret; - - if (str =3D=3D NULL) { - return -1; - } - uri_clean(uri); - - /* - * Try first to parse absolute refs, then fallback to relative if - * it fails. - */ - ret =3D rfc3986_parse(uri, str); - if (ret !=3D 0) { - uri_clean(uri); - ret =3D rfc3986_parse_relative_ref(uri, str); - if (ret !=3D 0) { - uri_clean(uri); - return ret; - } - } - return 0; -} - -/** - * uri_parse: - * @str: the URI string to analyze - * - * Parse an URI based on RFC 3986 - * - * URI-reference =3D [ absoluteURI | relativeURI ] [ "#" fragment ] - * - * Returns a newly built URI or NULL in case of error - */ -URI *uri_parse(const char *str) -{ - URI *uri; - int ret; - - if (str =3D=3D NULL) { - return NULL; - } - uri =3D uri_new(); - ret =3D rfc3986_parse_uri_reference(uri, str); - if (ret) { - uri_free(uri); - return NULL; - } - return uri; -} - -/** - * uri_parse_into: - * @uri: pointer to an URI structure - * @str: the string to analyze - * - * Parse an URI reference string based on RFC 3986 and fills in the - * appropriate fields of the @uri structure - * - * URI-reference =3D URI / relative-ref - * - * Returns 0 or the error code - */ -int uri_parse_into(URI *uri, const char *str) -{ - return rfc3986_parse_uri_reference(uri, str); -} - -/** - * uri_parse_raw: - * @str: the URI string to analyze - * @raw: if 1 unescaping of URI pieces are disabled - * - * Parse an URI but allows to keep intact the original fragments. - * - * URI-reference =3D URI / relative-ref - * - * Returns a newly built URI or NULL in case of error - */ -URI *uri_parse_raw(const char *str, int raw) -{ - URI *uri; - int ret; - - if (str =3D=3D NULL) { - return NULL; - } - uri =3D uri_new(); - if (raw) { - uri->cleanup |=3D 2; - } - ret =3D uri_parse_into(uri, str); - if (ret) { - uri_free(uri); - return NULL; - } - return uri; -} - -/************************************************************************ - * * - * Generic URI structure functions * - * * - ************************************************************************/ - -/** - * uri_new: - * - * Simply creates an empty URI - * - * Returns the new structure or NULL in case of error - */ -URI *uri_new(void) -{ - return g_new0(URI, 1); -} - -/** - * realloc2n: - * - * Function to handle properly a reallocation when saving an URI - * Also imposes some limit on the length of an URI string output - */ -static char *realloc2n(char *ret, int *max) -{ - char *temp; - int tmp; - - tmp =3D *max * 2; - temp =3D g_realloc(ret, (tmp + 1)); - *max =3D tmp; - return temp; -} - -/** - * uri_to_string: - * @uri: pointer to an URI - * - * Save the URI as an escaped string - * - * Returns a new string (to be deallocated by caller) - */ -char *uri_to_string(URI *uri) -{ - char *ret =3D NULL; - char *temp; - const char *p; - int len; - int max; - - if (uri =3D=3D NULL) { - return NULL; - } - - max =3D 80; - ret =3D g_malloc(max + 1); - len =3D 0; - - if (uri->scheme !=3D NULL) { - p =3D uri->scheme; - while (*p !=3D 0) { - if (len >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D *p++; - } - if (len >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D ':'; - } - if (uri->opaque !=3D NULL) { - p =3D uri->opaque; - while (*p !=3D 0) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p))) { - ret[len++] =3D *p++; - } else { - int val =3D *(unsigned char *)p++; - int hi =3D val / 0x10, lo =3D val % 0x10; - ret[len++] =3D '%'; - ret[len++] =3D hi + (hi > 9 ? 'A' - 10 : '0'); - ret[len++] =3D lo + (lo > 9 ? 'A' - 10 : '0'); - } - } - } else { - if (uri->server !=3D NULL) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '/'; - ret[len++] =3D '/'; - if (uri->user !=3D NULL) { - p =3D uri->user; - while (*p !=3D 0) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - if ((IS_UNRESERVED(*(p))) || ((*(p) =3D=3D ';')) || - ((*(p) =3D=3D ':')) || ((*(p) =3D=3D '&')) || ((*(= p) =3D=3D '=3D')) || - ((*(p) =3D=3D '+')) || ((*(p) =3D=3D '$')) || ((*(= p) =3D=3D ','))) { - ret[len++] =3D *p++; - } else { - int val =3D *(unsigned char *)p++; - int hi =3D val / 0x10, lo =3D val % 0x10; - ret[len++] =3D '%'; - ret[len++] =3D hi + (hi > 9 ? 'A' - 10 : '0'); - ret[len++] =3D lo + (lo > 9 ? 'A' - 10 : '0'); - } - } - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '@'; - } - p =3D uri->server; - while (*p !=3D 0) { - if (len >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D *p++; - } - if (uri->port > 0) { - if (len + 10 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - len +=3D snprintf(&ret[len], max - len, ":%d", uri->port); - } - } else if (uri->authority !=3D NULL) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '/'; - ret[len++] =3D '/'; - p =3D uri->authority; - while (*p !=3D 0) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - if ((IS_UNRESERVED(*(p))) || ((*(p) =3D=3D '$')) || - ((*(p) =3D=3D ',')) || ((*(p) =3D=3D ';')) || ((*(p) = =3D=3D ':')) || - ((*(p) =3D=3D '@')) || ((*(p) =3D=3D '&')) || ((*(p) = =3D=3D '=3D')) || - ((*(p) =3D=3D '+'))) { - ret[len++] =3D *p++; - } else { - int val =3D *(unsigned char *)p++; - int hi =3D val / 0x10, lo =3D val % 0x10; - ret[len++] =3D '%'; - ret[len++] =3D hi + (hi > 9 ? 'A' - 10 : '0'); - ret[len++] =3D lo + (lo > 9 ? 'A' - 10 : '0'); - } - } - } else if (uri->scheme !=3D NULL) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '/'; - ret[len++] =3D '/'; - } - if (uri->path !=3D NULL) { - p =3D uri->path; - /* - * the colon in file:///d: should not be escaped or - * Windows accesses fail later. - */ - if ((uri->scheme !=3D NULL) && (p[0] =3D=3D '/') && - (((p[1] >=3D 'a') && (p[1] <=3D 'z')) || - ((p[1] >=3D 'A') && (p[1] <=3D 'Z'))) && - (p[2] =3D=3D ':') && (!strcmp(uri->scheme, "file"))) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D *p++; - ret[len++] =3D *p++; - ret[len++] =3D *p++; - } - while (*p !=3D 0) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - if ((IS_UNRESERVED(*(p))) || ((*(p) =3D=3D '/')) || - ((*(p) =3D=3D ';')) || ((*(p) =3D=3D '@')) || ((*(p) = =3D=3D '&')) || - ((*(p) =3D=3D '=3D')) || ((*(p) =3D=3D '+')) || ((*(p)= =3D=3D '$')) || - ((*(p) =3D=3D ','))) { - ret[len++] =3D *p++; - } else { - int val =3D *(unsigned char *)p++; - int hi =3D val / 0x10, lo =3D val % 0x10; - ret[len++] =3D '%'; - ret[len++] =3D hi + (hi > 9 ? 'A' - 10 : '0'); - ret[len++] =3D lo + (lo > 9 ? 'A' - 10 : '0'); - } - } - } - if (uri->query !=3D NULL) { - if (len + 1 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '?'; - p =3D uri->query; - while (*p !=3D 0) { - if (len + 1 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D *p++; - } - } - } - if (uri->fragment !=3D NULL) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len++] =3D '#'; - p =3D uri->fragment; - while (*p !=3D 0) { - if (len + 3 >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p)))) { - ret[len++] =3D *p++; - } else { - int val =3D *(unsigned char *)p++; - int hi =3D val / 0x10, lo =3D val % 0x10; - ret[len++] =3D '%'; - ret[len++] =3D hi + (hi > 9 ? 'A' - 10 : '0'); - ret[len++] =3D lo + (lo > 9 ? 'A' - 10 : '0'); - } - } - } - if (len >=3D max) { - temp =3D realloc2n(ret, &max); - ret =3D temp; - } - ret[len] =3D 0; - return ret; -} - -/** - * uri_clean: - * @uri: pointer to an URI - * - * Make sure the URI struct is free of content - */ -static void uri_clean(URI *uri) -{ - if (uri =3D=3D NULL) { - return; - } - - g_free(uri->scheme); - uri->scheme =3D NULL; - g_free(uri->server); - uri->server =3D NULL; - g_free(uri->user); - uri->user =3D NULL; - g_free(uri->path); - uri->path =3D NULL; - g_free(uri->fragment); - uri->fragment =3D NULL; - g_free(uri->opaque); - uri->opaque =3D NULL; - g_free(uri->authority); - uri->authority =3D NULL; - g_free(uri->query); - uri->query =3D NULL; -} - -/** - * uri_free: - * @uri: pointer to an URI, NULL is ignored - * - * Free up the URI struct - */ -void uri_free(URI *uri) -{ - uri_clean(uri); - g_free(uri); -} - -/************************************************************************ - * * - * Public functions * - * * - ************************************************************************/ - -/* - * Utility functions to help parse and assemble query strings. - */ - -struct QueryParams *query_params_new(int init_alloc) -{ - struct QueryParams *ps; - - if (init_alloc <=3D 0) { - init_alloc =3D 1; - } - - ps =3D g_new(QueryParams, 1); - ps->n =3D 0; - ps->alloc =3D init_alloc; - ps->p =3D g_new(QueryParam, ps->alloc); - - return ps; -} - -/* Ensure there is space to store at least one more parameter - * at the end of the set. - */ -static int query_params_append(struct QueryParams *ps, const char *name, - const char *value) -{ - if (ps->n >=3D ps->alloc) { - ps->p =3D g_renew(QueryParam, ps->p, ps->alloc * 2); - ps->alloc *=3D 2; - } - - ps->p[ps->n].name =3D g_strdup(name); - ps->p[ps->n].value =3D g_strdup(value); - ps->p[ps->n].ignore =3D 0; - ps->n++; - - return 0; -} - -void query_params_free(struct QueryParams *ps) -{ - int i; - - for (i =3D 0; i < ps->n; ++i) { - g_free(ps->p[i].name); - g_free(ps->p[i].value); - } - g_free(ps->p); - g_free(ps); -} - -struct QueryParams *query_params_parse(const char *query) -{ - struct QueryParams *ps; - const char *end, *eq; - - ps =3D query_params_new(0); - if (!query || query[0] =3D=3D '\0') { - return ps; - } - - while (*query) { - char *name =3D NULL, *value =3D NULL; - - /* Find the next separator, or end of the string. */ - end =3D strchr(query, '&'); - if (!end) { - end =3D qemu_strchrnul(query, ';'); - } - - /* Find the first '=3D' character between here and end. */ - eq =3D strchr(query, '=3D'); - if (eq && eq >=3D end) { - eq =3D NULL; - } - - /* Empty section (eg. "&&"). */ - if (end =3D=3D query) { - goto next; - } - - /* If there is no '=3D' character, then we have just "name" - * and consistent with CGI.pm we assume value is "". - */ - else if (!eq) { - name =3D g_uri_unescape_segment(query, end, NULL); - value =3D NULL; - } - /* Or if we have "name=3D" here (works around annoying - * problem when calling uri_string_unescape with len =3D 0). - */ - else if (eq + 1 =3D=3D end) { - name =3D g_uri_unescape_segment(query, eq, NULL); - value =3D g_new0(char, 1); - } - /* If the '=3D' character is at the beginning then we have - * "=3Dvalue" and consistent with CGI.pm we _ignore_ this. - */ - else if (query =3D=3D eq) { - goto next; - } - - /* Otherwise it's "name=3Dvalue". */ - else { - name =3D g_uri_unescape_segment(query, eq, NULL); - value =3D g_uri_unescape_segment(eq + 1, end, NULL); - } - - /* Append to the parameter set. */ - query_params_append(ps, name, value); - g_free(name); - g_free(value); - - next: - query =3D end; - if (*query) { - query++; /* skip '&' separator */ - } - } - - return ps; -} diff --git a/util/meson.build b/util/meson.build index 0ef9886be0..e6a2c9acc8 100644 --- a/util/meson.build +++ b/util/meson.build @@ -94,7 +94,7 @@ if have_block util_ss.add(files('hbitmap.c')) util_ss.add(files('hexdump.c')) util_ss.add(files('iova-tree.c')) - util_ss.add(files('iov.c', 'uri.c')) + util_ss.add(files('iov.c')) util_ss.add(files('nvdimm-utils.c')) util_ss.add(files('block-helpers.c')) util_ss.add(files('qemu-coroutine-sleep.c')) --=20 2.44.0