* [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2
@ 2022-01-20 11:05 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
` (5 more replies)
0 siblings, 6 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
Refresh lcitool to latest and remove libxml2 (mjt).
v2:
- rebased (testing/next)
- include mjt's libxml2 removal patch
Supersedes: <20220110124638.610145-1-f4bug@amsat.org>
Michael Tokarev (1):
drop libxml2 checks since libxml is not actually used (for parallels)
Philippe Mathieu-Daudé (5):
MAINTAINERS: Cover lcitool submodule with build test / automation
tests: Refresh lcitool submodule
tests/lcitool: Install libibumad to cover RDMA on Debian based distros
tests/lcitool: Remove libxml2
tests: Manually remove libxml2 on MSYS2 targets
meson.build | 6 ------
.cirrus.yml | 1 -
.gitlab-ci.d/windows.yml | 2 --
MAINTAINERS | 1 +
block/meson.build | 3 +--
meson_options.txt | 2 --
scripts/ci/org.centos/stream/8/x86_64/configure | 1 -
scripts/coverity-scan/coverity-scan.docker | 1 -
scripts/coverity-scan/run-coverity-scan | 2 +-
tests/docker/dockerfiles/alpine.docker | 4 ++--
tests/docker/dockerfiles/centos8.docker | 4 +---
tests/docker/dockerfiles/fedora.docker | 4 +---
tests/docker/dockerfiles/opensuse-leap.docker | 3 +--
tests/docker/dockerfiles/ubuntu1804.docker | 4 ++--
tests/docker/dockerfiles/ubuntu2004.docker | 4 ++--
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/projects/qemu.yml | 2 +-
17 files changed, 14 insertions(+), 32 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 2/6] tests: Refresh lcitool submodule Philippe Mathieu-Daudé via
` (4 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
lcitool is used by build test / automation, we want maintainers
to get notified if the submodule is updated.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
MAINTAINERS | 1 +
1 file changed, 1 insertion(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 893a5567100..fb78499d6a0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3577,6 +3577,7 @@ F: .travis.yml
F: scripts/ci/
F: tests/docker/
F: tests/vm/
+F: tests/lcitool/
F: scripts/archive-source.sh
W: https://gitlab.com/qemu-project/qemu/pipelines
W: https://travis-ci.org/qemu/qemu
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/6] tests: Refresh lcitool submodule
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
` (3 subsequent siblings)
5 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
Refresh lcitool submodule and the generated files by running:
$ make lcitool-refresh
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/dockerfiles/alpine.docker | 3 ++-
tests/docker/dockerfiles/centos8.docker | 3 +--
tests/docker/dockerfiles/fedora.docker | 3 +--
tests/docker/dockerfiles/opensuse-leap.docker | 2 +-
tests/docker/dockerfiles/ubuntu1804.docker | 2 +-
tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
tests/lcitool/libvirt-ci | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index eb2251c81c8..9d7f74fc51e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile alpine-edge qemu
+# $ lcitool dockerfile --layers all alpine-edge qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -109,6 +109,7 @@ RUN apk update && \
zlib-dev \
zlib-static \
zstd-dev && \
+ apk list | 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 cbb909d02b3..fde6a036263 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile centos-8 qemu
+# $ lcitool dockerfile --layers all centos-8 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -69,7 +69,6 @@ RUN dnf update -y && \
libssh-devel \
libtasn1-devel \
libubsan \
- libudev-devel \
liburing-devel \
libusbx-devel \
libxml2-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 60207f3da38..82f504e40d6 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile fedora-35 qemu
+# $ lcitool dockerfile --layers all fedora-35 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
@@ -77,7 +77,6 @@ exec "$@"' > /usr/bin/nosync && \
libssh-devel \
libtasn1-devel \
libubsan \
- libudev-devel \
liburing-devel \
libusbx-devel \
libxml2-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index f57d8cfb299..30e7038148a 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile opensuse-leap-152 qemu
+# $ lcitool dockerfile --layers all opensuse-leap-152 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 0ffa3c4d4b5..4ea272d143b 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile ubuntu-1804 qemu
+# $ lcitool dockerfile --layers all ubuntu-1804 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 4e562dfdcd3..90988b2bc53 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile ubuntu-2004 qemu
+# $ lcitool dockerfile --layers all ubuntu-2004 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci
index 29cec2153b9..226c178a2a1 160000
--- a/tests/lcitool/libvirt-ci
+++ b/tests/lcitool/libvirt-ci
@@ -1 +1 @@
-Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd
+Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 2/6] tests: Refresh lcitool submodule Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 11:12 ` Daniel P. Berrangé
2022-01-20 11:05 ` [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
` (2 subsequent siblings)
5 siblings, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
On Debian we also need libibumad to enable RDMA:
$ ../configure --enable-rdma
ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present.
Your options:
(1) Fast: Install infiniband packages (devel) from your distro.
(2) Cleanest: Install libraries from www.openfabrics.org
(3) Also: Install softiwarp if you don't have RDMA hardware
Note, librdmacm and libibverbs are already listed in lcitool's qemu.yml.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/dockerfiles/ubuntu1804.docker | 1 +
tests/docker/dockerfiles/ubuntu2004.docker | 1 +
tests/lcitool/projects/qemu.yml | 1 +
3 files changed, 3 insertions(+)
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 4ea272d143b..7ebaab82b97 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglib2.0-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libibumad-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 90988b2bc53..b93707b70d4 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libglusterfs-dev \
libgnutls28-dev \
libgtk-3-dev \
+ libibumad-dev \
libibverbs-dev \
libiscsi-dev \
libjemalloc-dev \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index ed5ab1407a9..948b9912579 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -43,6 +43,7 @@ packages:
- libfdt
- libffi
- libgcrypt
+ - libibumad
- libibverbs
- libiscsi
- libjemalloc
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels)
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (2 preceding siblings ...)
2022-01-20 11:05 ` [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 13:37 ` Thomas Huth
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
5 siblings, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo,
Stefan Hajnoczi
From: Michael Tokarev <mjt@tls.msk.ru>
For a long time, we assumed that libxml2 is neecessary for parallels
block format support (block/parallels*). However, this format actually
does not use libxml [*]. Since this is the only user of libxml2 in
while qemu tree, we can drop all libxml2 checks and dependencies too.
It is even more: --enable-parallels configure option was the only
option which was silently ignored when it's (fake) dependency
(libxml2) isn't installed.
Drop all mentions of libxml2.
[*] Actually the basis for libxml use were merged in commit 25bfd5a75
but the implementation was never merged:
https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru>
[PMD: Updated description and adapted to use lcitool]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
meson.build | 6 ------
block/meson.build | 3 +--
meson_options.txt | 2 --
scripts/ci/org.centos/stream/8/x86_64/configure | 1 -
scripts/coverity-scan/coverity-scan.docker | 1 -
scripts/coverity-scan/run-coverity-scan | 2 +-
6 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/meson.build b/meson.build
index 333c61deba7..64a146e1d06 100644
--- a/meson.build
+++ b/meson.build
@@ -449,11 +449,6 @@
required: get_option('linux_io_uring'),
method: 'pkg-config', kwargs: static_kwargs)
endif
-libxml2 = not_found
-if not get_option('libxml2').auto() or have_block
- libxml2 = dependency('libxml-2.0', required: get_option('libxml2'),
- method: 'pkg-config', kwargs: static_kwargs)
-endif
libnfs = not_found
if not get_option('libnfs').auto() or have_block
libnfs = dependency('libnfs', version: '>=1.9.3',
@@ -3489,7 +3484,6 @@
summary_info += {'lzfse support': liblzfse}
summary_info += {'zstd support': zstd}
summary_info += {'NUMA host support': config_host.has_key('CONFIG_NUMA')}
-summary_info += {'libxml2': libxml2}
summary_info += {'capstone': capstone_opt == 'internal' ? capstone_opt : capstone}
summary_info += {'libpmem support': libpmem}
summary_info += {'libdaxctl support': libdaxctl}
diff --git a/block/meson.build b/block/meson.build
index deb73ca389f..90dc9983e56 100644
--- a/block/meson.build
+++ b/block/meson.build
@@ -58,8 +58,7 @@
'qed-table.c',
'qed.c',
))
-block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'],
- if_true: files('parallels.c', 'parallels-ext.c'))
+block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'parallels-ext.c'))
block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c'))
block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit])
block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c'))
diff --git a/meson_options.txt b/meson_options.txt
index 921967eddbb..95d527f7732 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto',
description: 'Use libudev to enumerate host devices')
option('libusb', type : 'feature', value : 'auto',
description: 'libusb support for USB passthrough')
-option('libxml2', type : 'feature', value : 'auto',
- description: 'libxml2 support for Parallels image format')
option('linux_aio', type : 'feature', value : 'auto',
description: 'Linux AIO support')
option('linux_io_uring', type : 'feature', value : 'auto',
diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure
index e05f2fddcc2..9850dd44444 100755
--- a/scripts/ci/org.centos/stream/8/x86_64/configure
+++ b/scripts/ci/org.centos/stream/8/x86_64/configure
@@ -81,7 +81,6 @@
--disable-libssh \
--disable-libudev \
--disable-libusb \
---disable-libxml2 \
--disable-linux-aio \
--disable-linux-io-uring \
--disable-linux-user \
diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-scan/coverity-scan.docker
index ecff6ac5b4b..6f60a52d231 100644
--- a/scripts/coverity-scan/coverity-scan.docker
+++ b/scripts/coverity-scan/coverity-scan.docker
@@ -59,7 +59,6 @@ ENV PACKAGES \
libubsan \
libudev-devel \
libusbx-devel \
- libxml2-devel \
libzstd-devel \
llvm \
lzo-devel \
diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-scan/run-coverity-scan
index 6d443250a9b..181bdcb2638 100755
--- a/scripts/coverity-scan/run-coverity-scan
+++ b/scripts/coverity-scan/run-coverity-scan
@@ -402,7 +402,7 @@ echo "Configuring..."
--enable-libiscsi --enable-libnfs --enable-seccomp \
--enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzip2 \
--enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \
- --enable-mpath --enable-libxml2 --enable-glusterfs \
+ --enable-mpath --enable-glusterfs \
--enable-virtfs --enable-zstd
echo "Running cov-build..."
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (3 preceding siblings ...)
2022-01-20 11:05 ` [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 11:14 ` Daniel P. Berrangé
2022-01-20 11:15 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
5 siblings, 2 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
The previous commit removed all uses of libxml2.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
tests/docker/dockerfiles/alpine.docker | 1 -
tests/docker/dockerfiles/centos8.docker | 1 -
tests/docker/dockerfiles/fedora.docker | 1 -
tests/docker/dockerfiles/opensuse-leap.docker | 1 -
tests/docker/dockerfiles/ubuntu1804.docker | 1 -
tests/docker/dockerfiles/ubuntu2004.docker | 1 -
tests/lcitool/projects/qemu.yml | 1 -
7 files changed, 7 deletions(-)
diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 9d7f74fc51e..591af43d60e 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -56,7 +56,6 @@ RUN apk update && \
libtasn1-dev \
liburing-dev \
libusb-dev \
- libxml2-dev \
linux-pam-dev \
llvm11 \
lttng-ust-dev \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index fde6a036263..3abac7a8b13 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -71,7 +71,6 @@ RUN dnf update -y && \
libubsan \
liburing-devel \
libusbx-devel \
- libxml2-devel \
libzstd-devel \
llvm \
lttng-ust-devel \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 82f504e40d6..1d01cd94405 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -79,7 +79,6 @@ exec "$@"' > /usr/bin/nosync && \
libubsan \
liburing-devel \
libusbx-devel \
- libxml2-devel \
libzstd-devel \
llvm \
lttng-ust-devel \
diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker
index 30e7038148a..1b78d8369a7 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -71,7 +71,6 @@ RUN zypper update -y && \
libudev-devel \
liburing-devel \
libusb-1_0-devel \
- libxml2-devel \
libzstd-devel \
llvm \
lttng-ust-devel \
diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker
index 7ebaab82b97..699f2dfc6a9 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvirglrenderer-dev \
libvte-2.91-dev \
libxen-dev \
- libxml2-dev \
libzstd-dev \
llvm \
locales \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index b93707b70d4..87513125b8e 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -92,7 +92,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvirglrenderer-dev \
libvte-2.91-dev \
libxen-dev \
- libxml2-dev \
libzstd-dev \
llvm \
locales \
diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml
index 948b9912579..958868a6ee9 100644
--- a/tests/lcitool/projects/qemu.yml
+++ b/tests/lcitool/projects/qemu.yml
@@ -64,7 +64,6 @@ packages:
- liburing
- libusbx
- libvdeplug
- - libxml2
- libzstd
- llvm
- lttng-ust
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
` (4 preceding siblings ...)
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
@ 2022-01-20 11:05 ` Philippe Mathieu-Daudé via
2022-01-20 11:08 ` Philippe Mathieu-Daudé via
2022-01-20 11:15 ` Daniel P. Berrangé
5 siblings, 2 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:05 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Philippe Mathieu-Daudé, Daniel P . Berrangé, qemu-block,
Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
lcitool doesn't support MSYS2 targets, so manually remove
this now unnecessary library.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.cirrus.yml | 1 -
.gitlab-ci.d/windows.yml | 2 --
2 files changed, 3 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 02c43a074a1..7552d709745 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -32,7 +32,6 @@ windows_msys2_task:
mingw-w64-x86_64-libgcrypt
mingw-w64-x86_64-libpng
mingw-w64-x86_64-libssh
- mingw-w64-x86_64-libxml2
mingw-w64-x86_64-snappy
mingw-w64-x86_64-libusb
mingw-w64-x86_64-usbredir
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 62dd9ed8329..1df16303491 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -44,7 +44,6 @@ msys2-64bit:
mingw-w64-x86_64-libssh
mingw-w64-x86_64-libtasn1
mingw-w64-x86_64-libusb
- mingw-w64-x86_64-libxml2
mingw-w64-x86_64-nettle
mingw-w64-x86_64-ninja
mingw-w64-x86_64-pixman
@@ -80,7 +79,6 @@ msys2-32bit:
mingw-w64-i686-libssh
mingw-w64-i686-libtasn1
mingw-w64-i686-libusb
- mingw-w64-i686-libxml2
mingw-w64-i686-lzo2
mingw-w64-i686-ninja
mingw-w64-i686-pixman
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
@ 2022-01-20 11:08 ` Philippe Mathieu-Daudé via
2022-01-20 11:15 ` Daniel P. Berrangé
1 sibling, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:08 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Daniel P . Berrangé, qemu-block, Thomas Huth, Li-Wen Hsu,
Peter Maydell, Yonggang Luo
Oops, 's/targets/runners/' in Subject...
On 1/20/22 12:05, Philippe Mathieu-Daudé wrote:
> lcitool doesn't support MSYS2 targets, so manually remove
> this now unnecessary library.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> .cirrus.yml | 1 -
> .gitlab-ci.d/windows.yml | 2 --
> 2 files changed, 3 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros
2022-01-20 11:05 ` [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
@ 2022-01-20 11:12 ` Daniel P. Berrangé
0 siblings, 0 replies; 18+ messages in thread
From: Daniel P. Berrangé @ 2022-01-20 11:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Ed Maste, qemu-block, Michael Tokarev,
qemu-devel, Yonggang Luo, Alex Bennée, Li-Wen Hsu
On Thu, Jan 20, 2022 at 12:05:42PM +0100, Philippe Mathieu-Daudé wrote:
> On Debian we also need libibumad to enable RDMA:
>
> $ ../configure --enable-rdma
>
> ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present.
> Your options:
> (1) Fast: Install infiniband packages (devel) from your distro.
> (2) Cleanest: Install libraries from www.openfabrics.org
> (3) Also: Install softiwarp if you don't have RDMA hardware
>
> Note, librdmacm and libibverbs are already listed in lcitool's qemu.yml.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/docker/dockerfiles/ubuntu1804.docker | 1 +
> tests/docker/dockerfiles/ubuntu2004.docker | 1 +
> tests/lcitool/projects/qemu.yml | 1 +
> 3 files changed, 3 insertions(+)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
@ 2022-01-20 11:14 ` Daniel P. Berrangé
2022-01-20 11:18 ` Philippe Mathieu-Daudé via
2022-01-20 11:15 ` Philippe Mathieu-Daudé via
1 sibling, 1 reply; 18+ messages in thread
From: Daniel P. Berrangé @ 2022-01-20 11:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Ed Maste, qemu-block, Michael Tokarev,
qemu-devel, Yonggang Luo, Alex Bennée, Li-Wen Hsu
On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote:
> The previous commit removed all uses of libxml2.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/docker/dockerfiles/alpine.docker | 1 -
> tests/docker/dockerfiles/centos8.docker | 1 -
> tests/docker/dockerfiles/fedora.docker | 1 -
> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
> tests/lcitool/projects/qemu.yml | 1 -
> 7 files changed, 7 deletions(-)
Did you change these dockerfiles manually ?
There is an 'make lcitool-refresh' target that does it automatically,
and this should have refreshed the Cirrus CI config files too which
are missed here.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:14 ` Daniel P. Berrangé
@ 2022-01-20 11:15 ` Philippe Mathieu-Daudé via
1 sibling, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:15 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Daniel P . Berrangé, qemu-block, Thomas Huth, Li-Wen Hsu,
Peter Maydell, Yonggang Luo
On 1/20/22 12:05, Philippe Mathieu-Daudé wrote:
> The previous commit removed all uses of libxml2.
Here I will amend:
Update lcitool's qemu.yml and refresh the generated files by running:
$ make lcitool-refresh
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/docker/dockerfiles/alpine.docker | 1 -
> tests/docker/dockerfiles/centos8.docker | 1 -
> tests/docker/dockerfiles/fedora.docker | 1 -
> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
> tests/lcitool/projects/qemu.yml | 1 -
> 7 files changed, 7 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
2022-01-20 11:08 ` Philippe Mathieu-Daudé via
@ 2022-01-20 11:15 ` Daniel P. Berrangé
1 sibling, 0 replies; 18+ messages in thread
From: Daniel P. Berrangé @ 2022-01-20 11:15 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Ed Maste, qemu-block, Michael Tokarev,
qemu-devel, Yonggang Luo, Alex Bennée, Li-Wen Hsu
On Thu, Jan 20, 2022 at 12:05:45PM +0100, Philippe Mathieu-Daudé wrote:
> lcitool doesn't support MSYS2 targets, so manually remove
> this now unnecessary library.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> .cirrus.yml | 1 -
> .gitlab-ci.d/windows.yml | 2 --
> 2 files changed, 3 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:14 ` Daniel P. Berrangé
@ 2022-01-20 11:18 ` Philippe Mathieu-Daudé via
2022-01-20 11:21 ` Philippe Mathieu-Daudé via
2022-01-20 11:35 ` Daniel P. Berrangé
0 siblings, 2 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:18 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Alex Bennée, Ed Maste, Michael Tokarev,
qemu-block, Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo
On 1/20/22 12:14, Daniel P. Berrangé wrote:
> On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote:
>> The previous commit removed all uses of libxml2.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>> tests/docker/dockerfiles/alpine.docker | 1 -
>> tests/docker/dockerfiles/centos8.docker | 1 -
>> tests/docker/dockerfiles/fedora.docker | 1 -
>> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
>> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
>> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
>> tests/lcitool/projects/qemu.yml | 1 -
>> 7 files changed, 7 deletions(-)
>
> Did you change these dockerfiles manually ?
No.
> There is an 'make lcitool-refresh' target that does it automatically,
> and this should have refreshed the Cirrus CI config files too which
> are missed here.
Odd:
$ make lcitool-refresh
GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3
tests/fp/berkeley-softfloat-3 dtc capstone slirp
Generate tests/docker/dockerfiles/centos8.docker
Generate tests/docker/dockerfiles/fedora.docker
Generate tests/docker/dockerfiles/ubuntu1804.docker
Generate tests/docker/dockerfiles/ubuntu2004.docker
Generate tests/docker/dockerfiles/opensuse-leap.docker
Generate tests/docker/dockerfiles/alpine.docker
Generate .gitlab-ci.d/cirrus/freebsd-12.vars
Generate .gitlab-ci.d/cirrus/freebsd-13.vars
Generate .gitlab-ci.d/cirrus/macos-11.vars
OK, this fixed it:
-- >8 --
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 033120e223d..25301f2ef0b 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None,
trailer=None):
def generate_cirrus(target, trailer=None):
filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
- cmd = [lcitool_path, "variables", target, "qemu"]
+ cmd = lcitool_cmd + ["variables", target, "qemu"]
generate(filename, cmd, trailer)
---
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:18 ` Philippe Mathieu-Daudé via
@ 2022-01-20 11:21 ` Philippe Mathieu-Daudé via
2022-01-20 11:32 ` Daniel P. Berrangé
2022-01-20 11:35 ` Daniel P. Berrangé
1 sibling, 1 reply; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 11:21 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: qemu-devel, Alex Bennée, Ed Maste, Michael Tokarev,
qemu-block, Thomas Huth, Li-Wen Hsu, Peter Maydell, Yonggang Luo,
Andrea Bolognani
(+Andrea)
On 1/20/22 12:18, Philippe Mathieu-Daudé wrote:
> On 1/20/22 12:14, Daniel P. Berrangé wrote:
>> On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote:
>>> The previous commit removed all uses of libxml2.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>>> ---
>>> tests/docker/dockerfiles/alpine.docker | 1 -
>>> tests/docker/dockerfiles/centos8.docker | 1 -
>>> tests/docker/dockerfiles/fedora.docker | 1 -
>>> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
>>> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
>>> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
>>> tests/lcitool/projects/qemu.yml | 1 -
BTW what is the difference between QEMU's qemu.yml and libvirt-ci's one?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:21 ` Philippe Mathieu-Daudé via
@ 2022-01-20 11:32 ` Daniel P. Berrangé
0 siblings, 0 replies; 18+ messages in thread
From: Daniel P. Berrangé @ 2022-01-20 11:32 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Ed Maste, qemu-block, Michael Tokarev,
qemu-devel, Andrea Bolognani, Yonggang Luo, Alex Bennée,
Li-Wen Hsu
On Thu, Jan 20, 2022 at 12:21:01PM +0100, Philippe Mathieu-Daudé wrote:
> (+Andrea)
>
> On 1/20/22 12:18, Philippe Mathieu-Daudé wrote:
> > On 1/20/22 12:14, Daniel P. Berrangé wrote:
> >> On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote:
> >>> The previous commit removed all uses of libxml2.
> >>>
> >>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >>> ---
> >>> tests/docker/dockerfiles/alpine.docker | 1 -
> >>> tests/docker/dockerfiles/centos8.docker | 1 -
> >>> tests/docker/dockerfiles/fedora.docker | 1 -
> >>> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
> >>> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
> >>> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
> >>> tests/lcitool/projects/qemu.yml | 1 -
>
> BTW what is the difference between QEMU's qemu.yml and libvirt-ci's one?
The intention is to remove the one in libvirt-ci.git as it is not
used now we maintain it directly in qemu.git
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 5/6] tests/lcitool: Remove libxml2
2022-01-20 11:18 ` Philippe Mathieu-Daudé via
2022-01-20 11:21 ` Philippe Mathieu-Daudé via
@ 2022-01-20 11:35 ` Daniel P. Berrangé
1 sibling, 0 replies; 18+ messages in thread
From: Daniel P. Berrangé @ 2022-01-20 11:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, Thomas Huth, Ed Maste, qemu-block, Michael Tokarev,
qemu-devel, Yonggang Luo, Alex Bennée, Li-Wen Hsu
On Thu, Jan 20, 2022 at 12:18:34PM +0100, Philippe Mathieu-Daudé wrote:
> On 1/20/22 12:14, Daniel P. Berrangé wrote:
> > On Thu, Jan 20, 2022 at 12:05:44PM +0100, Philippe Mathieu-Daudé wrote:
> >> The previous commit removed all uses of libxml2.
> >>
> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> >> ---
> >> tests/docker/dockerfiles/alpine.docker | 1 -
> >> tests/docker/dockerfiles/centos8.docker | 1 -
> >> tests/docker/dockerfiles/fedora.docker | 1 -
> >> tests/docker/dockerfiles/opensuse-leap.docker | 1 -
> >> tests/docker/dockerfiles/ubuntu1804.docker | 1 -
> >> tests/docker/dockerfiles/ubuntu2004.docker | 1 -
> >> tests/lcitool/projects/qemu.yml | 1 -
> >> 7 files changed, 7 deletions(-)
> >
> > Did you change these dockerfiles manually ?
>
> No.
>
> > There is an 'make lcitool-refresh' target that does it automatically,
> > and this should have refreshed the Cirrus CI config files too which
> > are missed here.
>
> Odd:
>
> $ make lcitool-refresh
> GIT ui/keycodemapdb meson tests/fp/berkeley-testfloat-3
> tests/fp/berkeley-softfloat-3 dtc capstone slirp
> Generate tests/docker/dockerfiles/centos8.docker
> Generate tests/docker/dockerfiles/fedora.docker
> Generate tests/docker/dockerfiles/ubuntu1804.docker
> Generate tests/docker/dockerfiles/ubuntu2004.docker
> Generate tests/docker/dockerfiles/opensuse-leap.docker
> Generate tests/docker/dockerfiles/alpine.docker
> Generate .gitlab-ci.d/cirrus/freebsd-12.vars
> Generate .gitlab-ci.d/cirrus/freebsd-13.vars
> Generate .gitlab-ci.d/cirrus/macos-11.vars
>
> OK, this fixed it:
>
> -- >8 --
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 033120e223d..25301f2ef0b 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=None,
> trailer=None):
>
> def generate_cirrus(target, trailer=None):
> filename = Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars")
> - cmd = [lcitool_path, "variables", target, "qemu"]
> + cmd = lcitool_cmd + ["variables", target, "qemu"]
> generate(filename, cmd, trailer)
Wierd, I wonder why that didn't result in an error. I must have screwed
this up in a rebase at some point after i created the .vars files
originally. Will you send this as a fix too in a v3.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels)
2022-01-20 11:05 ` [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
@ 2022-01-20 13:37 ` Thomas Huth
2022-01-20 15:33 ` Philippe Mathieu-Daudé via
0 siblings, 1 reply; 18+ messages in thread
From: Thomas Huth @ 2022-01-20 13:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: Peter Maydell, Ed Maste, qemu-block, Michael Tokarev,
Yonggang Luo, Stefan Hajnoczi, Daniel P . Berrangé,
Alex Bennée, Li-Wen Hsu
On 20/01/2022 12.05, Philippe Mathieu-Daudé wrote:
> From: Michael Tokarev <mjt@tls.msk.ru>
>
> For a long time, we assumed that libxml2 is neecessary for parallels
> block format support (block/parallels*). However, this format actually
> does not use libxml [*]. Since this is the only user of libxml2 in
> while qemu tree, we can drop all libxml2 checks and dependencies too.
s/while/whole/
> It is even more: --enable-parallels configure option was the only
> option which was silently ignored when it's (fake) dependency
> (libxml2) isn't installed.
>
> Drop all mentions of libxml2.
>
> [*] Actually the basis for libxml use were merged in commit 25bfd5a75
> but the implementation was never merged:
> https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/
Commit ed279a06c53784 also add a hunk to scripts/checkpatch.pl ... you might
want to remove that now, too.
Thomas
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels)
2022-01-20 13:37 ` Thomas Huth
@ 2022-01-20 15:33 ` Philippe Mathieu-Daudé via
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé via @ 2022-01-20 15:33 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Alex Bennée, Ed Maste, Michael Tokarev,
Daniel P . Berrangé, qemu-block, Li-Wen Hsu, Peter Maydell,
Yonggang Luo, Stefan Hajnoczi
On 20/1/22 14:37, Thomas Huth wrote:
> On 20/01/2022 12.05, Philippe Mathieu-Daudé wrote:
>> From: Michael Tokarev <mjt@tls.msk.ru>
>>
>> For a long time, we assumed that libxml2 is neecessary for parallels
Also "necessary",
>> block format support (block/parallels*). However, this format actually
>> does not use libxml [*]. Since this is the only user of libxml2 in
>> while qemu tree, we can drop all libxml2 checks and dependencies too.
and eventually "QEMU".
> s/while/whole/
>
>> It is even more: --enable-parallels configure option was the only
>> option which was silently ignored when it's (fake) dependency
>> (libxml2) isn't installed.
>>
>> Drop all mentions of libxml2.
>>
>> [*] Actually the basis for libxml use were merged in commit 25bfd5a75
>> but the implementation was never merged:
>>
>> https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9@openvz.org/
>>
>
> Commit ed279a06c53784 also add a hunk to scripts/checkpatch.pl ... you
> might want to remove that now, too.
Good catch!
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-01-20 22:12 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-20 11:05 [PATCH v2 0/6] tests: Refresh lcitool submodule & remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 2/6] tests: Refresh lcitool submodule Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Philippe Mathieu-Daudé via
2022-01-20 11:12 ` Daniel P. Berrangé
2022-01-20 11:05 ` [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Philippe Mathieu-Daudé via
2022-01-20 13:37 ` Thomas Huth
2022-01-20 15:33 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 5/6] tests/lcitool: Remove libxml2 Philippe Mathieu-Daudé via
2022-01-20 11:14 ` Daniel P. Berrangé
2022-01-20 11:18 ` Philippe Mathieu-Daudé via
2022-01-20 11:21 ` Philippe Mathieu-Daudé via
2022-01-20 11:32 ` Daniel P. Berrangé
2022-01-20 11:35 ` Daniel P. Berrangé
2022-01-20 11:15 ` Philippe Mathieu-Daudé via
2022-01-20 11:05 ` [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Philippe Mathieu-Daudé via
2022-01-20 11:08 ` Philippe Mathieu-Daudé via
2022-01-20 11:15 ` Daniel P. Berrangé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).