* [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code
@ 2024-04-18 10:10 Thomas Huth
2024-04-18 10:10 ` [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container Thomas Huth
` (12 more replies)
0 siblings, 13 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
In the QEMU 9.1 development cycle, we can drop the support for
Ubuntu 20.04 and CentOS 8 since the following major versions of
these distributions are available since 2 years already.
This allows us to bump the minimum version of glib to 2.66 which
comes with a nice set of URI parsing functions. By switching to
these parsing functions, we can finally drop our own URI parsing
code in util/uri.c.
NB: We also need to update some of the custom runners in our CI
environment first (since they still use Ubuntu 20.04).
v3:
- Added Reviewed-bys
- Updated many patch descriptions according to the review feedback in v2
- Change "Illegal" in warning message to "Invalid"
- Removed "." at the end of a warn_report string
v2:
- Added Paolo's patch to bump the external CI runners
- Added patch to drop more glib compatibility hunks
- Use g_autoptr() in the URI patches for simplification
- Don't allow port 0 in the URIs
Paolo Bonzini (1):
ci: move external build environment setups to CentOS Stream 9
Thomas Huth (12):
tests: Remove Ubuntu 20.04 container
tests/lcitool/libvirt-ci: Update to the latest master branch
tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update
tests: Update our CI to use CentOS Stream 9 instead of 8
.travis.yml: Update the jobs to Ubuntu 22.04
Bump minimum glib version to v2.66
Remove glib compatibility code that is not required anymore
block/gluster: Use URI parsing code from glib
block/nbd: Use URI parsing code from glib
block/nfs: Use URI parsing code from glib
block/ssh: Use URI parsing code from glib
util/uri: Remove the old URI parsing code
meson.build | 16 +-
include/glib-compat.h | 27 +-
include/qemu/uri.h | 99 --
block/gluster.c | 71 +-
block/nbd.c | 76 +-
block/nfs.c | 110 +-
block/ssh.c | 75 +-
qga/commands-posix-ssh.c | 12 +-
util/error-report.c | 10 -
util/uri.c | 1466 -----------------
.gitlab-ci.d/buildtest.yml | 16 +-
.gitlab-ci.d/container-core.yml | 4 +-
.travis.yml | 13 +-
.../stream/{8 => 9}/build-environment.yml | 31 +-
.../stream/{8 => 9}/x86_64/configure | 4 +-
.../stream/{8 => 9}/x86_64/test-avocado | 0
scripts/ci/setup/build-environment.yml | 44 +-
tests/docker/dockerfiles/alpine.docker | 3 +-
.../{centos8.docker => centos9.docker} | 35 +-
.../dockerfiles/debian-amd64-cross.docker | 3 +-
.../dockerfiles/debian-arm64-cross.docker | 3 +-
.../dockerfiles/debian-armel-cross.docker | 3 +-
.../dockerfiles/debian-armhf-cross.docker | 3 +-
.../dockerfiles/debian-i686-cross.docker | 3 +-
.../dockerfiles/debian-mips64el-cross.docker | 3 +-
.../dockerfiles/debian-mipsel-cross.docker | 3 +-
.../dockerfiles/debian-ppc64el-cross.docker | 3 +-
.../dockerfiles/debian-riscv64-cross.docker | 3 +-
.../dockerfiles/debian-s390x-cross.docker | 3 +-
tests/docker/dockerfiles/debian.docker | 1 +
.../dockerfiles/fedora-win64-cross.docker | 3 +-
tests/docker/dockerfiles/fedora.docker | 1 +
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/docker/dockerfiles/ubuntu2004.docker | 157 --
tests/docker/dockerfiles/ubuntu2204.docker | 1 +
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/mappings.yml | 20 -
tests/lcitool/refresh | 3 +-
tests/vm/centos | 4 +-
util/meson.build | 2 +-
40 files changed, 265 insertions(+), 2072 deletions(-)
delete mode 100644 include/qemu/uri.h
delete mode 100644 util/uri.c
rename scripts/ci/org.centos/stream/{8 => 9}/build-environment.yml (75%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/configure (98%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/test-avocado (100%)
rename tests/docker/dockerfiles/{centos8.docker => centos9.docker} (82%)
delete mode 100644 tests/docker/dockerfiles/ubuntu2004.docker
--
2.44.0
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-19 12:57 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 02/13] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
` (11 subsequent siblings)
12 siblings, 1 reply; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
Since Ubuntu 22.04 is now available since two years, we can stop
actively supporting the previous LTS version of Ubuntu now.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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/dockerfiles/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=noninteractive && \
- 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' --show > /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==0.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="".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")
#
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 02/13] tests/lcitool/libvirt-ci: Update to the latest master branch
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
2024-04-18 10:10 ` [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 03/13] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
` (10 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
We need the latest fixes for the lcitool to be able to properly
update our CentOS docker file to CentOS Stream 9.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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..cec6703971 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 77c800186f34b21be7660750577cc5582a914deb
+Subproject commit cec67039719becbfbab866f9c23574f389cf9559
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 03/13] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
2024-04-18 10:10 ` [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container Thomas Huth
2024-04-18 10:10 ` [PATCH v3 02/13] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
` (9 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
This update adds the removing of the EXTERNALLY-MANAGED marker files
that has been added to the lcitool recently.
Quoting Daniel:
"For those who don't know, python now commonly blocks the ability to
run 'pip install' outside of a venv. This generally makes sense for
a precious installation environment. Our containers are disposable
though, so a venv has no benefit. Removing the 'EXTERNALLY-MANAGED'
allows the historical arbitrary use of 'pip' outside a venv.
lcitool just does this unconditionally given the containers are
not precious."
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/docker/dockerfiles/alpine.docker | 3 ++-
tests/docker/dockerfiles/centos8.docker | 1 +
tests/docker/dockerfiles/debian-amd64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-arm64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-armel-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-armhf-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-i686-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-riscv64-cross.docker | 3 ++-
tests/docker/dockerfiles/debian-s390x-cross.docker | 3 ++-
tests/docker/dockerfiles/debian.docker | 1 +
tests/docker/dockerfiles/fedora-win64-cross.docker | 3 ++-
tests/docker/dockerfiles/fedora.docker | 1 +
tests/docker/dockerfiles/opensuse-leap.docker | 1 +
tests/docker/dockerfiles/ubuntu2204.docker | 1 +
17 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 42f6928627..cd9d7af1ce 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -116,7 +116,8 @@ RUN apk update && \
zlib-static \
zstd \
zstd-dev && \
- apk list | sort > /packages.txt && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
+ apk list --installed | sort > /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 && \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index d97c30e96a..ea618bf352 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -123,6 +123,7 @@ RUN dnf distro-sync -y && \
zstd && \
dnf autoremove -y && \
dnf clean all -y && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker
index 00bdc06021..d0b0e9778e 100644
--- a/tests/docker/dockerfiles/debian-amd64-cross.docker
+++ b/tests/docker/dockerfiles/debian-amd64-cross.docker
@@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker
index 2dae3777f7..8cb225740e 100644
--- a/tests/docker/dockerfiles/debian-arm64-cross.docker
+++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
@@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
index 75342c09b0..e6f37418ed 100644
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ b/tests/docker/dockerfiles/debian-armel-cross.docker
@@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker
index 180ed836e6..407a014f57 100644
--- a/tests/docker/dockerfiles/debian-armhf-cross.docker
+++ b/tests/docker/dockerfiles/debian-armhf-cross.docker
@@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index 3fc4e15acd..bdc9566b67 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker
index 17d3e01ecc..4d995d0b12 100644
--- a/tests/docker/dockerfiles/debian-mips64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker
@@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 5fcd641f15..0cf803bda5 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -65,7 +65,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
RUN /usr/bin/pip3 install tomli
diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
index d6be2f0cc5..6180ec08c3 100644
--- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker
+++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker
@@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker
index a26637ec4f..591572ae94 100644
--- a/tests/docker/dockerfiles/debian-riscv64-cross.docker
+++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker
@@ -33,7 +33,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker
index ec0041d6aa..90c8d3c7b8 100644
--- a/tests/docker/dockerfiles/debian-s390x-cross.docker
+++ b/tests/docker/dockerfiles/debian-s390x-cross.docker
@@ -64,7 +64,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
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-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker
index b5e642d5b6..5722482e4c 100644
--- a/tests/docker/dockerfiles/debian.docker
+++ b/tests/docker/dockerfiles/debian.docker
@@ -137,6 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index f8e4cb70d3..d1a480fa71 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -64,7 +64,8 @@ exec "$@"\n' > /usr/bin/nosync && \
xorriso \
zstd && \
nosync dnf autoremove -y && \
- nosync dnf clean all -y
+ nosync dnf clean all -y && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 9e9c71fa94..7e6ab0308a 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -137,6 +137,7 @@ exec "$@"\n' > /usr/bin/nosync && \
zstd && \
nosync dnf autoremove -y && \
nosync dnf clean all -y && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index cf753383a4..c4055bdd10 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -119,6 +119,7 @@ RUN zypper update -y && \
zlib-devel-static \
zstd && \
zypper clean --all && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
rpm -qa | sort > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
index 2ca9cff79c..b8e78331db 100644
--- a/tests/docker/dockerfiles/ubuntu2204.docker
+++ b/tests/docker/dockerfiles/ubuntu2204.docker
@@ -137,6 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
eatmydata apt-get autoclean -y && \
sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
dpkg-reconfigure locales && \
+ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
mkdir -p /usr/libexec/ccache-wrappers && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (2 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 03/13] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-19 13:05 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 05/13] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
` (8 subsequent siblings)
12 siblings, 1 reply; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
Another reason for doing this is that Centos Stream 8 will go EOL soon:
https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/
"After May 31, 2024, CentOS Stream 8 will be archived
and no further updates will be provided."
Thus upgrade our CentOS Stream container to major version 9 now.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.d/buildtest.yml | 16 ++++-----
.gitlab-ci.d/container-core.yml | 4 +--
.../{centos8.docker => 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 => 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-server
--enable-modules --enable-trace-backends=dtrace --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
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'
-amd64-centos8-container:
+amd64-centos9-container:
extends: .container_job_template
variables:
- NAME: centos8
+ NAME: centos9
amd64-fedora-container:
extends: .container_job_template
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos9.docker
similarity index 82%
rename from tests/docker/dockerfiles/centos8.docker
rename to tests/docker/dockerfiles/centos9.docker
index ea618bf352..6cf47ce786 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
-FROM quay.io/centos/centos:stream8
+FROM quay.io/centos/centos:stream9
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 \
@@ -132,18 +131,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
-RUN /usr/bin/pip3.8 install \
- meson==0.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:
meson:
- CentOSStream8:
OpenSUSELeap15:
python3:
- CentOSStream8: python38
OpenSUSELeap15: python311-base
python3-PyYAML:
- CentOSStream8: python38-PyYAML
OpenSUSELeap15:
python3-devel:
- CentOSStream8: python38-devel
OpenSUSELeap15: python311-devel
python3-docutils:
- CentOSStream8:
OpenSUSELeap15:
python3-numpy:
- CentOSStream8: python38-numpy
OpenSUSELeap15:
python3-opencv:
- CentOSStream8:
OpenSUSELeap15:
python3-pillow:
- CentOSStream8:
OpenSUSELeap15:
python3-pip:
- CentOSStream8: python38-pip
OpenSUSELeap15: python311-pip
python3-pillow:
- CentOSStream8:
OpenSUSELeap15:
python3-selinux:
- CentOSStream8:
OpenSUSELeap15:
python3-setuptools:
- CentOSStream8: python38-setuptools
OpenSUSELeap15: python311-setuptools
python3-sphinx:
- CentOSStream8:
OpenSUSELeap15:
python3-sphinx-rtd-theme:
- CentOSStream8:
OpenSUSELeap15:
python3-sqlite3:
- CentOSStream8: python38
OpenSUSELeap15: python311
python3-tomli:
@@ -69,15 +53,11 @@ mappings:
Fedora:
Debian12:
OpenSUSELeap15:
- # Not available for Python 3.8
- CentOSStream8:
python3-venv:
- CentOSStream8: python38
OpenSUSELeap15: python311-base
python3-wheel:
- CentOSStream8: python38-wheel
OpenSUSELeap15: python311-pip
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="".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=/dev/vdb;
sudo chmod a+r $SRC_ARCHIVE;
tar -xf $SRC_ARCHIVE;
- make docker-test-block@centos8 {verbose} J={jobs} NETWORK=1;
- make docker-test-quick@centos8 {verbose} J={jobs} NETWORK=1;
+ make docker-test-block@centos9 {verbose} J={jobs} NETWORK=1;
+ make docker-test-quick@centos9 {verbose} J={jobs} NETWORK=1;
"""
def build_image(self, img):
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 05/13] .travis.yml: Update the jobs to Ubuntu 22.04
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (3 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 06/13] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
` (7 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
According to our support policy, we'll soon drop our official support
for Ubuntu 20.04 ("Focal Fossa") in QEMU. Thus we should update the
Travis jobs now to a newer release (Ubuntu 22.04 - "Jammy Jellyfish")
for future testing. Since all jobs are using this release now, we
can drop the entries from the individual jobs and use the global
setting again.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.travis.yml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8a3ae76a7c..56a2a01e14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
os: linux
-dist: focal
+dist: jammy
language: c
compiler:
- gcc
@@ -7,7 +7,7 @@ cache:
# There is one cache per branch and compiler version.
# characteristics of each job are used to identify the cache:
# - OS name (currently only linux)
- # - OS distribution (for Linux, bionic or focal)
+ # - OS distribution (e.g. "jammy" for Linux)
# - Names and values of visible environment variables set in .travis.yml or Settings panel
timeout: 1200
ccache: true
@@ -83,7 +83,6 @@ jobs:
- name: "[aarch64] GCC check-tcg"
arch: arm64
- dist: focal
addons:
apt_packages:
- libaio-dev
@@ -119,7 +118,6 @@ jobs:
- name: "[ppc64] GCC check-tcg"
arch: ppc64le
- dist: focal
addons:
apt_packages:
- libaio-dev
@@ -154,7 +152,6 @@ jobs:
- name: "[s390x] GCC check-tcg"
arch: s390x
- dist: focal
addons:
apt_packages:
- libaio-dev
@@ -199,7 +196,6 @@ jobs:
- name: "[s390x] GCC (other-system)"
arch: s390x
- dist: focal
addons:
apt_packages:
- libaio-dev
@@ -229,7 +225,6 @@ jobs:
- name: "[s390x] GCC (user)"
arch: s390x
- dist: focal
addons:
apt_packages:
- libgcrypt20-dev
@@ -244,8 +239,7 @@ jobs:
- name: "[s390x] Clang (disable-tcg)"
arch: s390x
- dist: focal
- compiler: clang-10
+ compiler: clang
addons:
apt_packages:
- libaio-dev
@@ -271,7 +265,6 @@ jobs:
- libvdeplug-dev
- libvte-2.91-dev
- ninja-build
- - clang-10
env:
- TEST_CMD="make check-unit"
- CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-tools
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 06/13] ci: move external build environment setups to CentOS Stream 9
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (4 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 05/13] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 07/13] Bump minimum glib version to v2.66 Thomas Huth
` (6 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
From: Paolo Bonzini <pbonzini@redhat.com>
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 build environment playbooks to major
version 9 now.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240412103708.27650-1-pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.../stream/{8 => 9}/build-environment.yml | 31 ++++++-------
.../stream/{8 => 9}/x86_64/configure | 4 +-
.../stream/{8 => 9}/x86_64/test-avocado | 0
scripts/ci/setup/build-environment.yml | 44 +++++++------------
4 files changed, 34 insertions(+), 45 deletions(-)
rename scripts/ci/org.centos/stream/{8 => 9}/build-environment.yml (75%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/configure (98%)
rename scripts/ci/org.centos/stream/{8 => 9}/x86_64/test-avocado (100%)
diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml b/scripts/ci/org.centos/stream/9/build-environment.yml
similarity index 75%
rename from scripts/ci/org.centos/stream/8/build-environment.yml
rename to scripts/ci/org.centos/stream/9/build-environment.yml
index 1ead77e2cb..cd29fe6f27 100644
--- a/scripts/ci/org.centos/stream/8/build-environment.yml
+++ b/scripts/ci/org.centos/stream/9/build-environment.yml
@@ -2,32 +2,32 @@
- name: Installation of extra packages to build QEMU
hosts: all
tasks:
- - name: Extra check for CentOS Stream 8
+ - name: Extra check for CentOS Stream 9
lineinfile:
path: /etc/redhat-release
- line: CentOS Stream release 8
+ line: CentOS Stream release 9
state: present
check_mode: yes
- register: centos_stream_8
+ register: centos_stream_9
- - name: Enable EPEL repo on CentOS Stream 8
+ - name: Enable EPEL repo on CentOS Stream 9
dnf:
name:
- epel-release
state: present
when:
- - centos_stream_8
+ - centos_stream_9
- - name: Enable PowerTools repo on CentOS Stream 8
+ - name: Enable CRB repo on CentOS Stream 9
ini_file:
- path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
- section: powertools
+ path: /etc/yum.repos.d/centos.repo
+ section: crb
option: enabled
value: "1"
when:
- - centos_stream_8
+ - centos_stream_9
- - name: Install basic packages to build QEMU on CentOS Stream 8
+ - name: Install basic packages to build QEMU on CentOS Stream 9
dnf:
name:
- bzip2
@@ -42,7 +42,6 @@
- gettext
- git
- glib2-devel
- - glusterfs-api-devel
- gnutls-devel
- libaio-devel
- libcap-ng-devel
@@ -61,22 +60,24 @@
- lzo-devel
- make
- mesa-libEGL-devel
+ - meson
- nettle-devel
- ninja-build
- nmap-ncat
- numactl-devel
- pixman-devel
- - python38
+ - python3
+ - python3-pip
- python3-sphinx
+ - python3-sphinx_rtd_theme
+ - python3-tomli
- rdma-core-devel
- redhat-rpm-config
- snappy-devel
- - spice-glib-devel
- - spice-server-devel
- systemd-devel
- systemtap-sdt-devel
- tar
- zlib-devel
state: present
when:
- - centos_stream_8
+ - centos_stream_9
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/9/x86_64/configure
similarity index 98%
rename from scripts/ci/org.centos/stream/8/x86_64/configure
rename to scripts/ci/org.centos/stream/9/x86_64/configure
index 76781f17f4..1b6f40fd78 100755
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ b/scripts/ci/org.centos/stream/9/x86_64/configure
@@ -16,7 +16,7 @@
# that patches adding downstream specific devices are not available.
#
../configure \
---python=/usr/bin/python3.8 \
+--python=/usr/bin/python3.9 \
--prefix="/usr" \
--libdir="/usr/lib64" \
--datadir="/usr/share" \
@@ -157,7 +157,6 @@
--enable-docs \
--enable-fdt \
--enable-gcrypt \
---enable-glusterfs \
--enable-gnutls \
--enable-guest-agent \
--enable-iconv \
@@ -180,7 +179,6 @@
--enable-seccomp \
--enable-snappy \
--enable-smartcard \
---enable-spice \
--enable-system \
--enable-tcg \
--enable-tools \
diff --git a/scripts/ci/org.centos/stream/8/x86_64/test-avocado b/scripts/ci/org.centos/stream/9/x86_64/test-avocado
similarity index 100%
rename from scripts/ci/org.centos/stream/8/x86_64/test-avocado
rename to scripts/ci/org.centos/stream/9/x86_64/test-avocado
diff --git a/scripts/ci/setup/build-environment.yml b/scripts/ci/setup/build-environment.yml
index f344d1a850..9b7d96c01b 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -174,26 +174,26 @@
- ansible_facts['distribution_version'] == '22.04'
- ansible_facts['architecture'] == 'aarch64'
- - name: Enable EPEL repo on EL8
+ - name: Enable EPEL repo on EL9
dnf:
name:
- epel-release
state: present
when:
- ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_major_version'] == '8'
+ - ansible_facts['distribution_major_version'] == '9'
- - name: Enable PowerTools repo on CentOS 8
+ - name: Enable CRB repo on CentOS 9
ini_file:
- path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
- section: powertools
+ path: /etc/yum.repos.d/centos.repo
+ section: crb
option: enabled
value: "1"
when:
- ansible_facts['distribution_file_variety'] == 'CentOS'
- - ansible_facts['distribution_major_version'] == '8'
+ - ansible_facts['distribution_major_version'] == '9'
- - name: Install basic packages to build QEMU on EL8
+ - name: Install basic packages to build QEMU on EL9
dnf:
# This list of packages start with tests/docker/dockerfiles/centos8.docker
# but only include files that are common to all distro variants and present
@@ -211,7 +211,6 @@
- gettext
- git
- glib2-devel
- - glusterfs-api-devel
- gnutls-devel
- libaio-devel
- libcap-ng-devel
@@ -229,17 +228,20 @@
- lzo-devel
- make
- mesa-libEGL-devel
+ - meson
- nettle-devel
- ninja-build
- nmap-ncat
- numactl-devel
- pixman-devel
- - python38
+ - python3
+ - python3-pip
- python3-sphinx
+ - python3-sphinx_rtd_theme
+ - python3-tomli
- rdma-core-devel
- redhat-rpm-config
- snappy-devel
- - spice-glib-devel
- systemd-devel
- systemtap-sdt-devel
- tar
@@ -247,28 +249,16 @@
state: present
when:
- ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
-
- - name: Install packages only available on x86 and aarch64
- dnf:
- # Spice server not available in ppc64le
- name:
- - spice-server
- - spice-server-devel
- state: present
- when:
- - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
- - ansible_facts['architecture'] == 'aarch64' or ansible_facts['architecture'] == 'x86_64'
+ - ansible_facts['distribution_version'] == '9'
- name: Check whether the Python runtime version is managed by alternatives
stat:
path: /etc/alternatives/python3
register: python3
- - name: Set default Python runtime to 3.8 on EL8
- command: alternatives --set python3 /usr/bin/python3.8
+ - name: Set default Python runtime to 3.9 on EL9
+ command: alternatives --set python3 /usr/bin/python3.9
when:
- ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
- - ansible_facts['distribution_version'] == '8'
- - python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.8'
+ - ansible_facts['distribution_version'] == '9'
+ - python3.stat.exists and python3.stat.islnk and python3.stat.lnk_target != '/usr/bin/python3.9'
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 07/13] Bump minimum glib version to v2.66
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (5 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 06/13] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 08/13] Remove glib compatibility code that is not required anymore Thomas Huth
` (5 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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 91a0aa64c6..142bafab61 100644
--- a/meson.build
+++ b/meson.build
@@ -869,7 +869,7 @@ have_xen_pci_passthrough = get_option('xen_pci_passthrough') \
# 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 = '>=2.56.0'
+glib_req_ver = '>=2.66.0'
glib_pc = dependency('glib-2.0', version: glib_req_ver, required: true,
method: 'pkg-config')
glib_cflags = []
@@ -910,20 +910,6 @@ if not cc.compiles('''
to the right pkg-config files for your build target.''')
endif
-# Silence clang warnings triggered by glib < 2.57.2
-if not cc.compiles('''
- #include <glib.h>
- 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 += cc.get_supported_arguments('-Wno-unused-function')
-endif
glib = 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
/* 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
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -105,29 +105,6 @@ static inline gpointer g_memdup2_qemu(gconstpointer mem, gsize byte_size)
}
#define g_memdup2(m, s) g_memdup2_qemu(m, s)
-#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. Because of
- * these important differences the caller must be aware of, it's not #define 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 = 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 **error)
return p;
}
-#define g_unix_get_passwd_entry_qemu(username, err) \
+#define g_unix_get_passwd_entry(username, err) \
test_get_passwd_entry(username, err)
#endif
@@ -45,7 +45,7 @@ get_passwd_entry(const char *username, Error **errp)
g_autoptr(GError) err = NULL;
struct passwd *p;
- p = g_unix_get_passwd_entry_qemu(username, &err);
+ p = g_unix_get_passwd_entry(username, &err);
if (p == NULL) {
error_setg(errp, "failed to lookup user '%s': %s",
username, err->message);
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 08/13] Remove glib compatibility code that is not required anymore
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (6 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 07/13] Bump minimum glib version to v2.66 Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 09/13] block/gluster: Use URI parsing code from glib Thomas Huth
` (4 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
Now that we bumped the minumum glib version to 2.66, we can drop
the old code.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
qga/commands-posix-ssh.c | 8 --------
util/error-report.c | 10 ----------
2 files changed, 18 deletions(-)
diff --git a/qga/commands-posix-ssh.c b/qga/commands-posix-ssh.c
index b0e0b1d674..cc1f5a708e 100644
--- a/qga/commands-posix-ssh.c
+++ b/qga/commands-posix-ssh.c
@@ -288,7 +288,6 @@ qmp_guest_ssh_get_authorized_keys(const char *username, Error **errp)
}
#ifdef QGA_BUILD_UNIT_TEST
-#if GLIB_CHECK_VERSION(2, 60, 0)
static const strList test_key2 = {
.value = (char *)"algo key2 comments"
};
@@ -484,11 +483,4 @@ int main(int argc, char *argv[])
return g_test_run();
}
-#else
-int main(int argc, char *argv[])
-{
- g_test_message("test skipped, needs glib >= 2.60");
- return 0;
-}
-#endif /* GLIB_2_60 */
#endif /* BUILD_UNIT_TEST */
diff --git a/util/error-report.c b/util/error-report.c
index 6e44a55732..1b17c11de1 100644
--- a/util/error-report.c
+++ b/util/error-report.c
@@ -172,18 +172,8 @@ static void print_loc(void)
static char *
real_time_iso8601(void)
{
-#if GLIB_CHECK_VERSION(2,62,0)
g_autoptr(GDateTime) dt = g_date_time_new_now_utc();
- /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return g_date_time_format_iso8601(dt);
-#pragma GCC diagnostic pop
-#else
- GTimeVal tv;
- g_get_current_time(&tv);
- return g_time_val_to_iso8601(&tv);
-#endif
}
/*
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 09/13] block/gluster: Use URI parsing code from glib
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (7 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 08/13] Remove glib compatibility code that is not required anymore Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-19 13:10 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 10/13] block/nbd: " Thomas Huth
` (3 subsequent siblings)
12 siblings, 1 reply; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
Since version 2.66, glib has useful URI parsing functions, too.
Use those instead of the QEMU-internal ones to be finally able
to get rid of the latter.
Since g_uri_get_path() returns a const pointer, we also need to
tweak the parameter of parse_volume_options() (where we use the
result of g_uri_get_path() as input).
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
block/gluster.c | 71 ++++++++++++++++++++++++-------------------------
1 file changed, 35 insertions(+), 36 deletions(-)
diff --git a/block/gluster.c b/block/gluster.c
index cc74af06dc..1c9505f8bb 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -17,7 +17,6 @@
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
-#include "qemu/uri.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/option.h"
@@ -289,9 +288,9 @@ static void glfs_clear_preopened(glfs_t *fs)
}
}
-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;
if (!path) {
return -EINVAL;
@@ -349,13 +348,13 @@ static int parse_volume_options(BlockdevOptionsGluster *gconf, char *path)
static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,
const char *filename)
{
+ g_autoptr(GUri) uri = g_uri_parse(filename, G_URI_FLAGS_NONE, NULL);
+ g_autoptr(GHashTable) qp = NULL;
SocketAddress *gsconf;
- URI *uri;
- QueryParams *qp = NULL;
bool is_unix = false;
- int ret = 0;
+ const char *uri_scheme, *uri_query, *uri_server;
+ int uri_port, ret;
- uri = uri_parse(filename);
if (!uri) {
return -EINVAL;
}
@@ -364,57 +363,57 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,
QAPI_LIST_PREPEND(gconf->server, gsconf);
/* transport */
- if (!uri->scheme || !strcmp(uri->scheme, "gluster")) {
+ uri_scheme = g_uri_get_scheme(uri);
+ if (!uri_scheme || !strcmp(uri_scheme, "gluster")) {
gsconf->type = SOCKET_ADDRESS_TYPE_INET;
- } else if (!strcmp(uri->scheme, "gluster+tcp")) {
+ } else if (!strcmp(uri_scheme, "gluster+tcp")) {
gsconf->type = SOCKET_ADDRESS_TYPE_INET;
- } else if (!strcmp(uri->scheme, "gluster+unix")) {
+ } else if (!strcmp(uri_scheme, "gluster+unix")) {
gsconf->type = SOCKET_ADDRESS_TYPE_UNIX;
is_unix = true;
- } else if (!strcmp(uri->scheme, "gluster+rdma")) {
+ } else if (!strcmp(uri_scheme, "gluster+rdma")) {
gsconf->type = SOCKET_ADDRESS_TYPE_INET;
warn_report("rdma feature is not supported, falling back to tcp");
} else {
- ret = -EINVAL;
- goto out;
+ return -EINVAL;
}
- ret = parse_volume_options(gconf, uri->path);
+ ret = parse_volume_options(gconf, g_uri_get_path(uri));
if (ret < 0) {
- goto out;
+ return ret;
}
- qp = query_params_parse(uri->query);
- if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) {
- ret = -EINVAL;
- goto out;
+ uri_query = g_uri_get_query(uri);
+ if (uri_query) {
+ qp = g_uri_parse_params(uri_query, -1, "&", G_URI_PARAMS_NONE, NULL);
+ if (!qp) {
+ return -EINVAL;
+ }
+ ret = g_hash_table_size(qp);
+ if (ret > 1 || (is_unix && !ret) || (!is_unix && ret)) {
+ return -EINVAL;
+ }
}
+ uri_server = g_uri_get_host(uri);
+ uri_port = g_uri_get_port(uri);
+
if (is_unix) {
- if (uri->server || uri->port) {
- ret = -EINVAL;
- goto out;
- }
- if (strcmp(qp->p[0].name, "socket")) {
- ret = -EINVAL;
- goto out;
+ char *uri_socket = g_hash_table_lookup(qp, "socket");
+ if (uri_server || uri_port != -1 || !uri_socket) {
+ return -EINVAL;
}
- gsconf->u.q_unix.path = g_strdup(qp->p[0].value);
+ gsconf->u.q_unix.path = g_strdup(uri_socket);
} else {
- gsconf->u.inet.host = g_strdup(uri->server ? uri->server : "localhost");
- if (uri->port) {
- gsconf->u.inet.port = g_strdup_printf("%d", uri->port);
+ gsconf->u.inet.host = g_strdup(uri_server ? uri_server : "localhost");
+ if (uri_port > 0) {
+ gsconf->u.inet.port = g_strdup_printf("%d", uri_port);
} else {
gsconf->u.inet.port = g_strdup_printf("%d", GLUSTER_DEFAULT_PORT);
}
}
-out:
- if (qp) {
- query_params_free(qp);
- }
- uri_free(uri);
- return ret;
+ return 0;
}
static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 10/13] block/nbd: Use URI parsing code from glib
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (8 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 09/13] block/gluster: Use URI parsing code from glib Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 11/13] block/nfs: " Thomas Huth
` (2 subsequent siblings)
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
block/nbd.c | 76 ++++++++++++++++++++++++++---------------------------
1 file changed, 37 insertions(+), 39 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index ef05f7cdfd..589d28af83 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -31,7 +31,6 @@
#include "qemu/osdep.h"
#include "trace.h"
-#include "qemu/uri.h"
#include "qemu/option.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"
@@ -1514,30 +1513,31 @@ static void nbd_client_close(BlockDriverState *bs)
static int nbd_parse_uri(const char *filename, QDict *options)
{
- URI *uri;
+ g_autoptr(GUri) uri = g_uri_parse(filename, G_URI_FLAGS_NONE, NULL);
+ g_autoptr(GHashTable) qp = NULL;
const char *p;
- QueryParams *qp = NULL;
- int ret = 0;
+ int qp_n;
bool is_unix;
+ const char *uri_scheme, *uri_query, *uri_server;
+ int uri_port;
- uri = uri_parse(filename);
if (!uri) {
return -EINVAL;
}
/* transport */
- if (!g_strcmp0(uri->scheme, "nbd")) {
+ uri_scheme = g_uri_get_scheme(uri);
+ if (!g_strcmp0(uri_scheme, "nbd")) {
is_unix = false;
- } else if (!g_strcmp0(uri->scheme, "nbd+tcp")) {
+ } else if (!g_strcmp0(uri_scheme, "nbd+tcp")) {
is_unix = false;
- } else if (!g_strcmp0(uri->scheme, "nbd+unix")) {
+ } else if (!g_strcmp0(uri_scheme, "nbd+unix")) {
is_unix = true;
} else {
- ret = -EINVAL;
- goto out;
+ return -EINVAL;
}
- p = uri->path ? uri->path : "";
+ p = g_uri_get_path(uri) ?: "";
if (p[0] == '/') {
p++;
}
@@ -1545,52 +1545,50 @@ static int nbd_parse_uri(const char *filename, QDict *options)
qdict_put_str(options, "export", p);
}
- qp = query_params_parse(uri->query);
- if (qp->n > 1 || (is_unix && !qp->n) || (!is_unix && qp->n)) {
- ret = -EINVAL;
- goto out;
+ uri_query = g_uri_get_query(uri);
+ if (uri_query) {
+ qp = g_uri_parse_params(uri_query, -1, "&", G_URI_PARAMS_NONE, NULL);
+ if (!qp) {
+ return -EINVAL;
+ }
+ qp_n = g_hash_table_size(qp);
+ if (qp_n > 1 || (is_unix && !qp_n) || (!is_unix && qp_n)) {
+ return -EINVAL;
+ }
+ }
+
+ uri_server = g_uri_get_host(uri);
+ if (uri_server && !uri_server[0]) {
+ uri_server = NULL;
}
+ uri_port = g_uri_get_port(uri);
if (is_unix) {
/* nbd+unix:///export?socket=path */
- if (uri->server || uri->port || strcmp(qp->p[0].name, "socket")) {
- ret = -EINVAL;
- goto out;
+ const char *uri_socket = g_hash_table_lookup(qp, "socket");
+ if (uri_server || uri_port != -1 || !uri_socket) {
+ return -EINVAL;
}
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;
/* nbd[+tcp]://host[:port]/export */
- if (!uri->server) {
- ret = -EINVAL;
- goto out;
- }
-
- /* strip braces from literal IPv6 address */
- if (uri->server[0] == '[') {
- host = qstring_from_substr(uri->server, 1,
- strlen(uri->server) - 1);
- } else {
- host = qstring_from_str(uri->server);
+ if (!uri_server) {
+ return -EINVAL;
}
qdict_put_str(options, "server.type", "inet");
- qdict_put(options, "server.host", host);
+ qdict_put_str(options, "server.host", uri_server);
- port_str = g_strdup_printf("%d", uri->port ?: NBD_DEFAULT_PORT);
+ port_str = g_strdup_printf("%d", uri_port > 0 ? uri_port
+ : NBD_DEFAULT_PORT);
qdict_put_str(options, "server.port", port_str);
g_free(port_str);
}
-out:
- if (qp) {
- query_params_free(qp);
- }
- uri_free(uri);
- return ret;
+ return 0;
}
static bool nbd_has_filename_options_conflict(QDict *options, Error **errp)
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 11/13] block/nfs: Use URI parsing code from glib
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (9 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 10/13] block/nbd: " Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 12/13] block/ssh: " Thomas Huth
2024-04-18 10:10 ` [PATCH v3 13/13] util/uri: Remove the old URI parsing code Thomas Huth
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
While we're at it, slightly rephrase one of the error messages:
Use "Invalid value..." instead of "Illegal value..." since the
latter rather sounds like the users were breaking a law here.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
block/nfs.c | 110 ++++++++++++++++++++++++++--------------------------
1 file changed, 54 insertions(+), 56 deletions(-)
diff --git a/block/nfs.c b/block/nfs.c
index f737e19cd3..60240a8733 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,77 +78,76 @@ typedef struct NFSRPC {
static int nfs_parse_uri(const char *filename, QDict *options, Error **errp)
{
- URI *uri = NULL;
- QueryParams *qp = NULL;
- int ret = -EINVAL, i;
+ g_autoptr(GUri) uri = g_uri_parse(filename, G_URI_FLAGS_NONE, NULL);
+ GUriParamsIter qp;
+ const char *uri_server, *uri_path, *uri_query;
+ char *qp_name, *qp_value;
+ GError *gerror = NULL;
- uri = uri_parse(filename);
if (!uri) {
error_setg(errp, "Invalid URI specified");
- goto out;
+ return -EINVAL;
}
- if (g_strcmp0(uri->scheme, "nfs") != 0) {
+ if (!g_str_equal(g_uri_get_scheme(uri), "nfs")) {
error_setg(errp, "URI scheme must be 'nfs'");
- goto out;
+ return -EINVAL;
}
- if (!uri->server) {
+ uri_server = g_uri_get_host(uri);
+ if (!uri_server || !uri_server[0]) {
error_setg(errp, "missing hostname in URI");
- goto out;
+ return -EINVAL;
}
- if (!uri->path) {
+ uri_path = g_uri_get_path(uri);
+ if (!uri_path || !uri_path[0]) {
error_setg(errp, "missing file path in URI");
- goto out;
- }
-
- qp = query_params_parse(uri->query);
- if (!qp) {
- error_setg(errp, "could not parse query parameters");
- goto out;
+ return -EINVAL;
}
- 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 = 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 = 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");
+ return -EINVAL;
+ }
+ if (!qp_value) {
+ error_setg(errp, "Value for NFS parameter expected: %s",
+ qp_name);
+ return -EINVAL;
+ }
+ if (parse_uint_full(qp_value, 0, &val)) {
+ error_setg(errp, "Invalid value for NFS parameter: %s",
+ qp_name);
+ return -EINVAL;
+ }
+ 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);
+ return -EINVAL;
+ }
}
}
- ret = 0;
-out:
- if (qp) {
- query_params_free(qp);
- }
- uri_free(uri);
- return ret;
+
+ return 0;
}
static bool nfs_has_filename_options_conflict(QDict *options, Error **errp)
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 12/13] block/ssh: Use URI parsing code from glib
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (10 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 11/13] block/nfs: " Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
2024-04-18 10:10 ` [PATCH v3 13/13] util/uri: Remove the old URI parsing code Thomas Huth
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
While we're at it, also emit a warning when encountering unknown
parameters in the URI, so that the users have a chance to detect
their typos or other mistakes.
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
block/ssh.c | 75 ++++++++++++++++++++++++++++-------------------------
1 file changed, 40 insertions(+), 35 deletions(-)
diff --git a/block/ssh.c b/block/ssh.c
index 2748253d4a..a88171d4b5 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,65 +180,71 @@ static void sftp_error_trace(BDRVSSHState *s, const char *op)
static int parse_uri(const char *filename, QDict *options, Error **errp)
{
- URI *uri = NULL;
- QueryParams *qp;
+ g_autoptr(GUri) uri = g_uri_parse(filename, G_URI_FLAGS_NONE, NULL);
+ const char *uri_host, *uri_path, *uri_user, *uri_query;
char *port_str;
- int i;
+ int port;
+ g_autoptr(GError) gerror = NULL;
+ char *qp_name, *qp_value;
+ GUriParamsIter qp;
- uri = uri_parse(filename);
if (!uri) {
return -EINVAL;
}
- if (g_strcmp0(uri->scheme, "ssh") != 0) {
+ if (g_strcmp0(g_uri_get_scheme(uri), "ssh") != 0) {
error_setg(errp, "URI scheme must be 'ssh'");
- goto err;
+ return -EINVAL;
}
- if (!uri->server || strcmp(uri->server, "") == 0) {
+ uri_host = g_uri_get_host(uri);
+ if (!uri_host || g_str_equal(uri_host, "")) {
error_setg(errp, "missing hostname in URI");
- goto err;
+ return -EINVAL;
}
- if (!uri->path || strcmp(uri->path, "") == 0) {
+ uri_path = g_uri_get_path(uri);
+ if (!uri_path || g_str_equal(uri_path, "")) {
error_setg(errp, "missing remote path in URI");
- goto err;
- }
-
- qp = query_params_parse(uri->query);
- if (!qp) {
- error_setg(errp, "could not parse query parameters");
- goto err;
+ return -EINVAL;
}
- if(uri->user && strcmp(uri->user, "") != 0) {
- qdict_put_str(options, "user", uri->user);
+ uri_user = g_uri_get_user(uri);
+ if (uri_user && !g_str_equal(uri_user, "")) {
+ qdict_put_str(options, "user", uri_user);
}
- qdict_put_str(options, "server.host", uri->server);
+ qdict_put_str(options, "server.host", uri_host);
- port_str = g_strdup_printf("%d", uri->port ?: 22);
+ port = g_uri_get_port(uri);
+ port_str = g_strdup_printf("%d", port > 0 ? port : 22);
qdict_put_str(options, "server.port", port_str);
g_free(port_str);
- qdict_put_str(options, "path", uri->path);
-
- /* Pick out any query parameters that we understand, and ignore
- * the rest.
- */
- for (i = 0; i < qp->n; ++i) {
- if (strcmp(qp->p[i].name, "host_key_check") == 0) {
- qdict_put_str(options, "host_key_check", qp->p[i].value);
+ qdict_put_str(options, "path", uri_path);
+
+ uri_query = 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);
+ }
}
}
- query_params_free(qp);
- uri_free(uri);
return 0;
-
- err:
- uri_free(uri);
- return -EINVAL;
}
static bool ssh_has_filename_options_conflict(QDict *options, Error **errp)
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v3 13/13] util/uri: Remove the old URI parsing code
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
` (11 preceding siblings ...)
2024-04-18 10:10 ` [PATCH v3 12/13] block/ssh: " Thomas Huth
@ 2024-04-18 10:10 ` Thomas Huth
12 siblings, 0 replies; 17+ messages in thread
From: Thomas Huth @ 2024-04-18 10:10 UTC (permalink / raw)
To: Alex Bennée, Philippe Mathieu-Daudé,
Eric Blake, Vladimir Sementsov-Ogievskiy, Peter Lieven,
Richard W.M. Jones, Paolo Bonzini, qemu-devel
Cc: Kevin Wolf, Hanna Reitz, Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
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.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * 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 SHALL THE
- * DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * 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 SOFTWARE.
- *
- * Except as contained in this notice, the name of Daniel Veillard shall not
- * 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 <https://www.gnu.org/licenses/>.
- *
- * Authors:
- * Richard W.M. Jones <rjones@redhat.com>
- *
- * 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=value'. */
-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"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * 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 SHALL THE
- * DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * 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 SOFTWARE.
- *
- * Except as contained in this notice, the name of Daniel Veillard shall not
- * 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 <https://www.gnu.org/licenses/>.
- *
- * Authors:
- * Richard W.M. Jones <rjones@redhat.com>
- *
- */
-
-#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 = lowalpha | upalpha
- */
-#define IS_ALPHA(x) (IS_LOWALPHA(x) || IS_UPALPHA(x))
-
-/*
- * lowalpha = "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) >= 'a') && ((x) <= 'z'))
-
-/*
- * upalpha = "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) >= 'A') && ((x) <= 'Z'))
-
-#ifdef IS_DIGIT
-#undef IS_DIGIT
-#endif
-/*
- * digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"
- */
-#define IS_DIGIT(x) (((x) >= '0') && ((x) <= '9'))
-
-/*
- * alphanum = alpha | digit
- */
-
-#define IS_ALPHANUM(x) (IS_ALPHA(x) || IS_DIGIT(x))
-
-/*
- * mark = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
- */
-
-#define IS_MARK(x) (((x) == '-') || ((x) == '_') || ((x) == '.') || \
- ((x) == '!') || ((x) == '~') || ((x) == '*') || ((x) == '\'') || \
- ((x) == '(') || ((x) == ')'))
-
-/*
- * unwise = "{" | "}" | "|" | "\" | "^" | "`"
- */
-
-#define IS_UNWISE(p) \
- (((*(p) == '{')) || ((*(p) == '}')) || ((*(p) == '|')) || \
- ((*(p) == '\\')) || ((*(p) == '^')) || ((*(p) == '[')) || \
- ((*(p) == ']')) || ((*(p) == '`')))
-/*
- * reserved = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | "," |
- * "[" | "]"
- */
-
-#define IS_RESERVED(x) (((x) == ';') || ((x) == '/') || ((x) == '?') || \
- ((x) == ':') || ((x) == '@') || ((x) == '&') || ((x) == '=') || \
- ((x) == '+') || ((x) == '$') || ((x) == ',') || ((x) == '[') || \
- ((x) == ']'))
-
-/*
- * unreserved = alphanum | mark
- */
-
-#define IS_UNRESERVED(x) (IS_ALPHANUM(x) || IS_MARK(x))
-
-/*
- * Skip to next pointer char, handle escaped sequences
- */
-
-#define NEXT(p) ((*p == '%') ? p += 3 : p++)
-
-/*
- * Productions from the spec.
- *
- * authority = server | reg_name
- * reg_name = 1*( unreserved | escaped | "$" | "," |
- * ";" | ":" | "@" | "&" | "=" | "+" )
- *
- * path = [ abs_path | opaque_part ]
- */
-
-/************************************************************************
- * *
- * RFC 3986 parser *
- * *
- ************************************************************************/
-
-#define ISA_DIGIT(p) ((*(p) >= '0') && (*(p) <= '9'))
-#define ISA_ALPHA(p) (((*(p) >= 'a') && (*(p) <= 'z')) || \
- ((*(p) >= 'A') && (*(p) <= 'Z')))
-#define ISA_HEXDIG(p) \
- (ISA_DIGIT(p) || ((*(p) >= 'a') && (*(p) <= 'f')) || \
- ((*(p) >= 'A') && (*(p) <= 'F')))
-
-/*
- * sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
- * / "*" / "+" / "," / ";" / "="
- */
-#define ISA_SUB_DELIM(p) \
- (((*(p) == '!')) || ((*(p) == '$')) || ((*(p) == '&')) || \
- ((*(p) == '(')) || ((*(p) == ')')) || ((*(p) == '*')) || \
- ((*(p) == '+')) || ((*(p) == ',')) || ((*(p) == ';')) || \
- ((*(p) == '=')) || ((*(p) == '\'')))
-
-/*
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- */
-#define ISA_UNRESERVED(p) \
- ((ISA_ALPHA(p)) || (ISA_DIGIT(p)) || ((*(p) == '-')) || \
- ((*(p) == '.')) || ((*(p) == '_')) || ((*(p) == '~')))
-
-/*
- * pct-encoded = "%" HEXDIG HEXDIG
- */
-#define ISA_PCT_ENCODED(p) \
- ((*(p) == '%') && (ISA_HEXDIG(p + 1)) && (ISA_HEXDIG(p + 2)))
-
-/*
- * pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
- */
-#define ISA_PCHAR(p) \
- (ISA_UNRESERVED(p) || ISA_PCT_ENCODED(p) || ISA_SUB_DELIM(p) || \
- ((*(p) == ':')) || ((*(p) == '@')))
-
-/**
- * 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 == NULL) {
- return -1;
- }
-
- cur = *str;
- if (!ISA_ALPHA(cur)) {
- return 2;
- }
- cur++;
- while (ISA_ALPHA(cur) || ISA_DIGIT(cur) || (*cur == '+') || (*cur == '-') ||
- (*cur == '.')) {
- cur++;
- }
- if (uri != NULL) {
- g_free(uri->scheme);
- uri->scheme = g_strndup(*str, cur - *str);
- }
- *str = 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 = *( 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 == NULL) {
- return -1;
- }
-
- cur = *str;
-
- while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||
- (*cur == '[') || (*cur == ']') ||
- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {
- NEXT(cur);
- }
- if (uri != NULL) {
- g_free(uri->fragment);
- if (uri->cleanup & 2) {
- uri->fragment = g_strndup(*str, cur - *str);
- } else {
- uri->fragment = g_uri_unescape_segment(*str, cur, NULL);
- }
- }
- *str = 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 = *uric
- *
- * Returns 0 or the error code
- */
-static int rfc3986_parse_query(URI *uri, const char **str)
-{
- const char *cur;
-
- if (str == NULL) {
- return -1;
- }
-
- cur = *str;
-
- while ((ISA_PCHAR(cur)) || (*cur == '/') || (*cur == '?') ||
- ((uri != NULL) && (uri->cleanup & 1) && (IS_UNWISE(cur)))) {
- NEXT(cur);
- }
- if (uri != NULL) {
- g_free(uri->query);
- uri->query = g_strndup(*str, cur - *str);
- }
- *str = 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 = *DIGIT
- *
- * Returns 0 or the error code
- */
-static int rfc3986_parse_port(URI *uri, const char **str)
-{
- const char *cur = *str;
- int port = 0;
-
- if (ISA_DIGIT(cur)) {
- while (ISA_DIGIT(cur)) {
- port = port * 10 + (*cur - '0');
- if (port > 65535) {
- return 1;
- }
- cur++;
- }
- if (uri) {
- uri->port = port;
- }
- *str = 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 = *( 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 = *str;
- while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur) ||
- (*cur == ':')) {
- NEXT(cur);
- }
- if (*cur == '@') {
- if (uri != NULL) {
- g_free(uri->user);
- if (uri->cleanup & 2) {
- uri->user = g_strndup(*str, cur - *str);
- } else {
- uri->user = g_uri_unescape_segment(*str, cur, NULL);
- }
- }
- *str = cur;
- return 0;
- }
- return 1;
-}
-
-/**
- * rfc3986_parse_dec_octet:
- * @str: the string to analyze
- *
- * dec-octet = 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 = *str;
-
- if (!(ISA_DIGIT(cur))) {
- return 1;
- }
- if (!ISA_DIGIT(cur + 1)) {
- cur++;
- } else if ((*cur != '0') && (ISA_DIGIT(cur + 1)) && (!ISA_DIGIT(cur + 2))) {
- cur += 2;
- } else if ((*cur == '1') && (ISA_DIGIT(cur + 1)) && (ISA_DIGIT(cur + 2))) {
- cur += 3;
- } else if ((*cur == '2') && (*(cur + 1) >= '0') && (*(cur + 1) <= '4') &&
- (ISA_DIGIT(cur + 2))) {
- cur += 3;
- } else if ((*cur == '2') && (*(cur + 1) == '5') && (*(cur + 2) >= '0') &&
- (*(cur + 1) <= '5')) {
- cur += 3;
- } else {
- return 1;
- }
- *str = 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 = IP-literal / IPv4address / reg-name
- * IP-literal = "[" ( IPv6address / IPvFuture ) "]"
- * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet
- * reg-name = *( unreserved / pct-encoded / sub-delims )
- *
- * Returns 0 or the error code
- */
-static int rfc3986_parse_host(URI *uri, const char **str)
-{
- const char *cur = *str;
- const char *host;
-
- host = cur;
- /*
- * IPv6 and future addressing scheme are enclosed between brackets
- */
- if (*cur == '[') {
- cur++;
- while ((*cur != ']') && (*cur != 0)) {
- cur++;
- }
- if (*cur != ']') {
- return 1;
- }
- cur++;
- goto found;
- }
- /*
- * try to parse an IPv4
- */
- if (ISA_DIGIT(cur)) {
- if (rfc3986_parse_dec_octet(&cur) != 0) {
- goto not_ipv4;
- }
- if (*cur != '.') {
- goto not_ipv4;
- }
- cur++;
- if (rfc3986_parse_dec_octet(&cur) != 0) {
- goto not_ipv4;
- }
- if (*cur != '.') {
- goto not_ipv4;
- }
- if (rfc3986_parse_dec_octet(&cur) != 0) {
- goto not_ipv4;
- }
- if (*cur != '.') {
- goto not_ipv4;
- }
- if (rfc3986_parse_dec_octet(&cur) != 0) {
- goto not_ipv4;
- }
- goto found;
- not_ipv4:
- cur = *str;
- }
- /*
- * then this should be a hostname which can be empty
- */
- while (ISA_UNRESERVED(cur) || ISA_PCT_ENCODED(cur) || ISA_SUB_DELIM(cur)) {
- NEXT(cur);
- }
-found:
- if (uri != NULL) {
- g_free(uri->authority);
- uri->authority = NULL;
- g_free(uri->server);
- if (cur != host) {
- if (uri->cleanup & 2) {
- uri->server = g_strndup(host, cur - host);
- } else {
- uri->server = g_uri_unescape_segment(host, cur, NULL);
- }
- } else {
- uri->server = NULL;
- }
- }
- *str = 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 = [ 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 = *str;
- /*
- * try to parse a userinfo and check for the trailing @
- */
- ret = rfc3986_parse_user_info(uri, &cur);
- if ((ret != 0) || (*cur != '@')) {
- cur = *str;
- } else {
- cur++;
- }
- ret = rfc3986_parse_host(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- if (*cur == ':') {
- cur++;
- ret = rfc3986_parse_port(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- }
- *str = 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 = *pchar
- * segment-nz = 1*pchar
- * segment-nz-nc = 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 = *str;
- if (!ISA_PCHAR(cur)) {
- if (empty) {
- return 0;
- }
- return 1;
- }
- while (ISA_PCHAR(cur) && (*cur != forbid)) {
- NEXT(cur);
- }
- *str = 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 = *( "/" 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 = *str;
-
- while (*cur == '/') {
- cur++;
- ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0) {
- return ret;
- }
- }
- if (uri != NULL) {
- g_free(uri->path);
- if (*str != cur) {
- if (uri->cleanup & 2) {
- uri->path = g_strndup(*str, cur - *str);
- } else {
- uri->path = g_uri_unescape_segment(*str, cur, NULL);
- }
- } else {
- uri->path = NULL;
- }
- }
- *str = 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 = "/" [ 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 = *str;
-
- if (*cur != '/') {
- return 1;
- }
- cur++;
- ret = rfc3986_parse_segment(&cur, 0, 0);
- if (ret == 0) {
- while (*cur == '/') {
- cur++;
- ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0) {
- return ret;
- }
- }
- }
- if (uri != NULL) {
- g_free(uri->path);
- if (cur != *str) {
- if (uri->cleanup & 2) {
- uri->path = g_strndup(*str, cur - *str);
- } else {
- uri->path = g_uri_unescape_segment(*str, cur, NULL);
- }
- } else {
- uri->path = NULL;
- }
- }
- *str = 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 = 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 = *str;
-
- ret = rfc3986_parse_segment(&cur, 0, 0);
- if (ret != 0) {
- return ret;
- }
- while (*cur == '/') {
- cur++;
- ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0) {
- return ret;
- }
- }
- if (uri != NULL) {
- g_free(uri->path);
- if (cur != *str) {
- if (uri->cleanup & 2) {
- uri->path = g_strndup(*str, cur - *str);
- } else {
- uri->path = g_uri_unescape_segment(*str, cur, NULL);
- }
- } else {
- uri->path = NULL;
- }
- }
- *str = 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 = 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 = *str;
-
- ret = rfc3986_parse_segment(&cur, ':', 0);
- if (ret != 0) {
- return ret;
- }
- while (*cur == '/') {
- cur++;
- ret = rfc3986_parse_segment(&cur, 0, 1);
- if (ret != 0) {
- return ret;
- }
- }
- if (uri != NULL) {
- g_free(uri->path);
- if (cur != *str) {
- if (uri->cleanup & 2) {
- uri->path = g_strndup(*str, cur - *str);
- } else {
- uri->path = g_uri_unescape_segment(*str, cur, NULL);
- }
- } else {
- uri->path = NULL;
- }
- }
- *str = 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 = "//" 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 = *str;
-
- if ((*cur == '/') && (*(cur + 1) == '/')) {
- cur += 2;
- ret = rfc3986_parse_authority(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- ret = rfc3986_parse_path_ab_empty(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- *str = cur;
- return 0;
- } else if (*cur == '/') {
- ret = rfc3986_parse_path_absolute(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- } else if (ISA_PCHAR(cur)) {
- ret = rfc3986_parse_path_rootless(uri, &cur);
- if (ret != 0) {
- return ret;
- }
- } else {
- /* path-empty is effectively empty */
- if (uri != NULL) {
- g_free(uri->path);
- uri->path = NULL;
- }
- }
- *str = 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 = relative-part [ "?" query ] [ "#" fragment ]
- * relative-part = "//" 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 == '/') && (*(str + 1) == '/')) {
- str += 2;
- ret = rfc3986_parse_authority(uri, &str);
- if (ret != 0) {
- return ret;
- }
- ret = rfc3986_parse_path_ab_empty(uri, &str);
- if (ret != 0) {
- return ret;
- }
- } else if (*str == '/') {
- ret = rfc3986_parse_path_absolute(uri, &str);
- if (ret != 0) {
- return ret;
- }
- } else if (ISA_PCHAR(str)) {
- ret = rfc3986_parse_path_no_scheme(uri, &str);
- if (ret != 0) {
- return ret;
- }
- } else {
- /* path-empty is effectively empty */
- if (uri != NULL) {
- g_free(uri->path);
- uri->path = NULL;
- }
- }
-
- if (*str == '?') {
- str++;
- ret = rfc3986_parse_query(uri, &str);
- if (ret != 0) {
- return ret;
- }
- }
- if (*str == '#') {
- str++;
- ret = rfc3986_parse_fragment(uri, &str);
- if (ret != 0) {
- return ret;
- }
- }
- if (*str != 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 = rfc3986_parse_scheme(uri, &str);
- if (ret != 0) {
- return ret;
- }
- if (*str != ':') {
- return 1;
- }
- str++;
- ret = rfc3986_parse_hier_part(uri, &str);
- if (ret != 0) {
- return ret;
- }
- if (*str == '?') {
- str++;
- ret = rfc3986_parse_query(uri, &str);
- if (ret != 0) {
- return ret;
- }
- }
- if (*str == '#') {
- str++;
- ret = rfc3986_parse_fragment(uri, &str);
- if (ret != 0) {
- return ret;
- }
- }
- if (*str != 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 = URI / relative-ref
- *
- * Returns 0 or the error code
- */
-static int rfc3986_parse_uri_reference(URI *uri, const char *str)
-{
- int ret;
-
- if (str == NULL) {
- return -1;
- }
- uri_clean(uri);
-
- /*
- * Try first to parse absolute refs, then fallback to relative if
- * it fails.
- */
- ret = rfc3986_parse(uri, str);
- if (ret != 0) {
- uri_clean(uri);
- ret = rfc3986_parse_relative_ref(uri, str);
- if (ret != 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 = [ 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 == NULL) {
- return NULL;
- }
- uri = uri_new();
- ret = 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 = 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 = 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 == NULL) {
- return NULL;
- }
- uri = uri_new();
- if (raw) {
- uri->cleanup |= 2;
- }
- ret = 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 = *max * 2;
- temp = g_realloc(ret, (tmp + 1));
- *max = 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 = NULL;
- char *temp;
- const char *p;
- int len;
- int max;
-
- if (uri == NULL) {
- return NULL;
- }
-
- max = 80;
- ret = g_malloc(max + 1);
- len = 0;
-
- if (uri->scheme != NULL) {
- p = uri->scheme;
- while (*p != 0) {
- if (len >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = *p++;
- }
- if (len >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = ':';
- }
- if (uri->opaque != NULL) {
- p = uri->opaque;
- while (*p != 0) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- if (IS_RESERVED(*(p)) || IS_UNRESERVED(*(p))) {
- ret[len++] = *p++;
- } else {
- int val = *(unsigned char *)p++;
- int hi = val / 0x10, lo = val % 0x10;
- ret[len++] = '%';
- ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
- ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
- }
- }
- } else {
- if (uri->server != NULL) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '/';
- ret[len++] = '/';
- if (uri->user != NULL) {
- p = uri->user;
- while (*p != 0) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- if ((IS_UNRESERVED(*(p))) || ((*(p) == ';')) ||
- ((*(p) == ':')) || ((*(p) == '&')) || ((*(p) == '=')) ||
- ((*(p) == '+')) || ((*(p) == '$')) || ((*(p) == ','))) {
- ret[len++] = *p++;
- } else {
- int val = *(unsigned char *)p++;
- int hi = val / 0x10, lo = val % 0x10;
- ret[len++] = '%';
- ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
- ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
- }
- }
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '@';
- }
- p = uri->server;
- while (*p != 0) {
- if (len >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = *p++;
- }
- if (uri->port > 0) {
- if (len + 10 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- len += snprintf(&ret[len], max - len, ":%d", uri->port);
- }
- } else if (uri->authority != NULL) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '/';
- ret[len++] = '/';
- p = uri->authority;
- while (*p != 0) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- if ((IS_UNRESERVED(*(p))) || ((*(p) == '$')) ||
- ((*(p) == ',')) || ((*(p) == ';')) || ((*(p) == ':')) ||
- ((*(p) == '@')) || ((*(p) == '&')) || ((*(p) == '=')) ||
- ((*(p) == '+'))) {
- ret[len++] = *p++;
- } else {
- int val = *(unsigned char *)p++;
- int hi = val / 0x10, lo = val % 0x10;
- ret[len++] = '%';
- ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
- ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
- }
- }
- } else if (uri->scheme != NULL) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '/';
- ret[len++] = '/';
- }
- if (uri->path != NULL) {
- p = uri->path;
- /*
- * the colon in file:///d: should not be escaped or
- * Windows accesses fail later.
- */
- if ((uri->scheme != NULL) && (p[0] == '/') &&
- (((p[1] >= 'a') && (p[1] <= 'z')) ||
- ((p[1] >= 'A') && (p[1] <= 'Z'))) &&
- (p[2] == ':') && (!strcmp(uri->scheme, "file"))) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = *p++;
- ret[len++] = *p++;
- ret[len++] = *p++;
- }
- while (*p != 0) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- if ((IS_UNRESERVED(*(p))) || ((*(p) == '/')) ||
- ((*(p) == ';')) || ((*(p) == '@')) || ((*(p) == '&')) ||
- ((*(p) == '=')) || ((*(p) == '+')) || ((*(p) == '$')) ||
- ((*(p) == ','))) {
- ret[len++] = *p++;
- } else {
- int val = *(unsigned char *)p++;
- int hi = val / 0x10, lo = val % 0x10;
- ret[len++] = '%';
- ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
- ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
- }
- }
- }
- if (uri->query != NULL) {
- if (len + 1 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '?';
- p = uri->query;
- while (*p != 0) {
- if (len + 1 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = *p++;
- }
- }
- }
- if (uri->fragment != NULL) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len++] = '#';
- p = uri->fragment;
- while (*p != 0) {
- if (len + 3 >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- if ((IS_UNRESERVED(*(p))) || (IS_RESERVED(*(p)))) {
- ret[len++] = *p++;
- } else {
- int val = *(unsigned char *)p++;
- int hi = val / 0x10, lo = val % 0x10;
- ret[len++] = '%';
- ret[len++] = hi + (hi > 9 ? 'A' - 10 : '0');
- ret[len++] = lo + (lo > 9 ? 'A' - 10 : '0');
- }
- }
- }
- if (len >= max) {
- temp = realloc2n(ret, &max);
- ret = temp;
- }
- ret[len] = 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 == NULL) {
- return;
- }
-
- g_free(uri->scheme);
- uri->scheme = NULL;
- g_free(uri->server);
- uri->server = NULL;
- g_free(uri->user);
- uri->user = NULL;
- g_free(uri->path);
- uri->path = NULL;
- g_free(uri->fragment);
- uri->fragment = NULL;
- g_free(uri->opaque);
- uri->opaque = NULL;
- g_free(uri->authority);
- uri->authority = NULL;
- g_free(uri->query);
- uri->query = 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 <= 0) {
- init_alloc = 1;
- }
-
- ps = g_new(QueryParams, 1);
- ps->n = 0;
- ps->alloc = init_alloc;
- ps->p = 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 >= ps->alloc) {
- ps->p = g_renew(QueryParam, ps->p, ps->alloc * 2);
- ps->alloc *= 2;
- }
-
- ps->p[ps->n].name = g_strdup(name);
- ps->p[ps->n].value = g_strdup(value);
- ps->p[ps->n].ignore = 0;
- ps->n++;
-
- return 0;
-}
-
-void query_params_free(struct QueryParams *ps)
-{
- int i;
-
- for (i = 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 = query_params_new(0);
- if (!query || query[0] == '\0') {
- return ps;
- }
-
- while (*query) {
- char *name = NULL, *value = NULL;
-
- /* Find the next separator, or end of the string. */
- end = strchr(query, '&');
- if (!end) {
- end = qemu_strchrnul(query, ';');
- }
-
- /* Find the first '=' character between here and end. */
- eq = strchr(query, '=');
- if (eq && eq >= end) {
- eq = NULL;
- }
-
- /* Empty section (eg. "&&"). */
- if (end == query) {
- goto next;
- }
-
- /* If there is no '=' character, then we have just "name"
- * and consistent with CGI.pm we assume value is "".
- */
- else if (!eq) {
- name = g_uri_unescape_segment(query, end, NULL);
- value = NULL;
- }
- /* Or if we have "name=" here (works around annoying
- * problem when calling uri_string_unescape with len = 0).
- */
- else if (eq + 1 == end) {
- name = g_uri_unescape_segment(query, eq, NULL);
- value = g_new0(char, 1);
- }
- /* If the '=' character is at the beginning then we have
- * "=value" and consistent with CGI.pm we _ignore_ this.
- */
- else if (query == eq) {
- goto next;
- }
-
- /* Otherwise it's "name=value". */
- else {
- name = g_uri_unescape_segment(query, eq, NULL);
- value = 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 = 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'))
--
2.44.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container
2024-04-18 10:10 ` [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container Thomas Huth
@ 2024-04-19 12:57 ` Eric Blake
0 siblings, 0 replies; 17+ messages in thread
From: Eric Blake @ 2024-04-19 12:57 UTC (permalink / raw)
To: Thomas Huth
Cc: Alex Bennée, Philippe Mathieu-Daudé,
Vladimir Sementsov-Ogievskiy, Peter Lieven, Richard W.M. Jones,
Paolo Bonzini, qemu-devel, Kevin Wolf, Hanna Reitz,
Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
On Thu, Apr 18, 2024 at 12:10:44PM +0200, Thomas Huth wrote:
> Since Ubuntu 22.04 is now available since two years, we can stop
Grammar suggestion:
Since Ubuntu 22.04 has now been available for more than two years,
> actively supporting the previous LTS version of Ubuntu now.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
--
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization: qemu.org | libguestfs.org
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8
2024-04-18 10:10 ` [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
@ 2024-04-19 13:05 ` Eric Blake
0 siblings, 0 replies; 17+ messages in thread
From: Eric Blake @ 2024-04-19 13:05 UTC (permalink / raw)
To: Thomas Huth
Cc: Alex Bennée, Philippe Mathieu-Daudé,
Vladimir Sementsov-Ogievskiy, Peter Lieven, Richard W.M. Jones,
Paolo Bonzini, qemu-devel, Kevin Wolf, Hanna Reitz,
Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
On Thu, Apr 18, 2024 at 12:10:47PM +0200, Thomas Huth wrote:
> 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
Grammar suggestion:
RHEL 9 (and thus also the derivatives) have been available for two years now,
> support for the previous major version 8 now.
>
> Another reason for doing this is that Centos Stream 8 will go EOL soon:
>
> https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/
>
> "After May 31, 2024, CentOS Stream 8 will be archived
> and no further updates will be provided."
>
> Thus upgrade our CentOS Stream container to major version 9 now.
>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization: qemu.org | libguestfs.org
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v3 09/13] block/gluster: Use URI parsing code from glib
2024-04-18 10:10 ` [PATCH v3 09/13] block/gluster: Use URI parsing code from glib Thomas Huth
@ 2024-04-19 13:10 ` Eric Blake
0 siblings, 0 replies; 17+ messages in thread
From: Eric Blake @ 2024-04-19 13:10 UTC (permalink / raw)
To: Thomas Huth
Cc: Alex Bennée, Philippe Mathieu-Daudé,
Vladimir Sementsov-Ogievskiy, Peter Lieven, Richard W.M. Jones,
Paolo Bonzini, qemu-devel, Kevin Wolf, Hanna Reitz,
Daniel P. Berrangé,
Konstantin Kostiuk, qemu-block
On Thu, Apr 18, 2024 at 12:10:52PM +0200, Thomas Huth wrote:
> Since version 2.66, glib has useful URI parsing functions, too.
> Use those instead of the QEMU-internal ones to be finally able
> to get rid of the latter.
>
> Since g_uri_get_path() returns a const pointer, we also need to
> tweak the parameter of parse_volume_options() (where we use the
> result of g_uri_get_path() as input).
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> block/gluster.c | 71 ++++++++++++++++++++++++-------------------------
> 1 file changed, 35 insertions(+), 36 deletions(-)
>
> @@ -364,57 +363,57 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster *gconf,
> QAPI_LIST_PREPEND(gconf->server, gsconf);
>
> /* transport */
> - if (!uri->scheme || !strcmp(uri->scheme, "gluster")) {
> + uri_scheme = g_uri_get_scheme(uri);
> + if (!uri_scheme || !strcmp(uri_scheme, "gluster")) {
> gsconf->type = SOCKET_ADDRESS_TYPE_INET;
It may be worth a mention in the commit message that we are aware that
this provides a positive user-visible change as a side-effect: namely,
by virtue of using glib's parser (which normalizes the scheme to
lowercase) instead of our own (which did not), we now accept
GLUSTER:// URIs in addition to the usual gluster:// spelling. Similar
comments to all the other affected patches in the series.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization: qemu.org | libguestfs.org
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-04-19 13:11 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-18 10:10 [PATCH v3 00/13] Drop old distros, bump glib and switch to glib URI parsing code Thomas Huth
2024-04-18 10:10 ` [PATCH v3 01/13] tests: Remove Ubuntu 20.04 container Thomas Huth
2024-04-19 12:57 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 02/13] tests/lcitool/libvirt-ci: Update to the latest master branch Thomas Huth
2024-04-18 10:10 ` [PATCH v3 03/13] tests/docker/dockerfiles: Run lcitool-refresh after the lcitool update Thomas Huth
2024-04-18 10:10 ` [PATCH v3 04/13] tests: Update our CI to use CentOS Stream 9 instead of 8 Thomas Huth
2024-04-19 13:05 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 05/13] .travis.yml: Update the jobs to Ubuntu 22.04 Thomas Huth
2024-04-18 10:10 ` [PATCH v3 06/13] ci: move external build environment setups to CentOS Stream 9 Thomas Huth
2024-04-18 10:10 ` [PATCH v3 07/13] Bump minimum glib version to v2.66 Thomas Huth
2024-04-18 10:10 ` [PATCH v3 08/13] Remove glib compatibility code that is not required anymore Thomas Huth
2024-04-18 10:10 ` [PATCH v3 09/13] block/gluster: Use URI parsing code from glib Thomas Huth
2024-04-19 13:10 ` Eric Blake
2024-04-18 10:10 ` [PATCH v3 10/13] block/nbd: " Thomas Huth
2024-04-18 10:10 ` [PATCH v3 11/13] block/nfs: " Thomas Huth
2024-04-18 10:10 ` [PATCH v3 12/13] block/ssh: " Thomas Huth
2024-04-18 10:10 ` [PATCH v3 13/13] util/uri: Remove the old URI parsing code Thomas Huth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.