Drop libslirp submodule
v2 cover Drop libslirp submodule
At the point in time we're going to release QEMU 7.2, all supported host OS distributions will have a libslirp package available, so there is no need anymore for us to ship the slirp submodule. Thus let's clean up the related tests and finally remove the submodule now.
v2:
- Added patches to clean up and adapt the tests
- Rebased the removal patch to the latest version of the master branch
Thomas Huth (6):
tests/docker: Update the debian-all-test-cross container to Debian 11 tests/vm: Add libslirp to the VM tests tests/lcitool/libvirt-ci: Update the lcitool module to the latest
version
tests: Refresh dockerfiles and FreeBSD vars with lcitool tests/avocado: Do not run tests that require libslirp if it is not
available
Remove the slirp submodule (i.e. compile only with an external
libslirp)
configure | 24 ---- meson.build | 121 ++++-------------- .gitlab-ci.d/buildtest.yml | 20 ++- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/container-cross.yml | 1 - .gitmodules | 3 - MAINTAINERS | 1 - meson_options.txt | 5 +- scripts/archive-source.sh | 2 +- scripts/meson-buildoptions.sh | 4 +- slirp | 1 - tests/avocado/avocado_qemu/__init__.py | 7 + tests/avocado/info_usernet.py | 1 + tests/avocado/replay_linux.py | 1 + tests/docker/Makefile.include | 1 - .../dockerfiles/debian-all-test-cross.docker | 9 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- tests/vm/freebsd | 3 + tests/vm/haiku.x86_64 | 3 +- tests/vm/netbsd | 3 + 23 files changed, 64 insertions(+), 156 deletions(-) delete mode 160000 slirp
Signature · 1 line
2.31.1
PATCH v2 1/6 tests/docker: Update the debian-all-test-cross container to Debian 11
The "build-tci" job in our CI is running the pxe-test that requires slirp. However, we are going to remove the slirp submodule from QEMU, so we need to run the test in a container that provides libslirp from the OS distribution.
Currently, the debian-all-test-cross container that is used for the "build-tci" job is based on Debian 10 - which is not supported by QEMU anymore and does not have libslirp as a system library. Thus we really need to update the container to Debian 11 now to keep the "build-tci" job working.
--- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-all-test-cross.docker | 9 ++++++++- 3 files changed, 8 insertions(+), 3 deletions(-)
.gitlab-ci.d/container-cross.yml +0 -1
@@ -15,7 +15,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross
tests/docker/Makefile.include +0 -1
@@ -139,7 +139,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ # Specialist build images, sometimes very limited tools docker-image-debian-tricore-cross: docker-image-debian10 -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10
tests/docker/dockerfiles/debian-all-test-cross.docker +8 -1
@@ -6,16 +6,23 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # What we need to build QEMU itself RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy qemu # Add the foreign architecture we want and install dependencies RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + clang \ + git \ + gdb-multiarch \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \
Signature · 1 line
2.31.1
PATCH v2 2/6 tests/vm: Add libslirp to the VM tests
In reply to Thomas HuthWe are going to remove the slirp submodule from the QEMU repository, so we should make sure to install the distro's libslirp to get the same test coverage as before in the VMs.
--- tests/vm/freebsd | 3 +++ tests/vm/haiku.x86_64 | 3 ++- tests/vm/netbsd | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-)
tests/vm/freebsd +3 -0
@@ -63,6 +63,9 @@ class FreeBSDVM(basevm.BaseVM): # libs: migration "zstd", + + # libs: networking + "libslirp", ] BUILD_SCRIPT = """
tests/vm/haiku.x86_64 +2 -1
@@ -71,6 +71,7 @@ class HaikuVM(basevm.BaseVM): "devel:libpixman_1", "devel:libpng16", "devel:libsdl2_2.0", + "devel:libslirp", "devel:libsnappy", "devel:libssh2", "devel:libtasn1",
@@ -89,7 +90,7 @@ class HaikuVM(basevm.BaseVM): mkdir -p /usr/bin ln -s /boot/system/bin/env /usr/bin/env cd ../build - ../src/configure --disable-slirp {configure_opts}; + ../src/configure {configure_opts}; make --output-sync -j{jobs} {target} {verbose}; """
tests/vm/netbsd +3 -0
@@ -54,6 +54,9 @@ class NetBSDVM(basevm.BaseVM): # libs: migration "zstd", + + # libs: networking + "libslirp", ] BUILD_SCRIPT = """
Signature · 1 line
2.31.1
PATCH v2 3/6 tests/lcitool/libvirt-ci: Update the lcitool module to the latest version
In reply to Thomas HuthThe latest version of the lcitool now supports libslirp on FreeBSD, too.
--- tests/lcitool/libvirt-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tests/lcitool/libvirt-ci +1 -1
@@ -1 +1 @@ -Subproject commit 324355cf62e86fb551408575afb123bac989ac37 +Subproject commit bc06b58be9ff74e50e410cace1cd054e6f99a57a
Signature · 1 line
2.31.1
PATCH v2 4/6 tests: Refresh dockerfiles and FreeBSD vars with lcitool
In reply to Thomas HuthRun tests/lcitool/refresh to get the latest updates (like libslirp in the FreeBSD files) from lcitool.
--- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
.gitlab-ci.d/cirrus/freebsd-12.vars +1 -1
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3'
.gitlab-ci.d/cirrus/freebsd-13.vars +1 -1
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3'
tests/docker/dockerfiles/opensuse-leap.docker +1 -1
@@ -127,7 +127,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make"
tests/docker/dockerfiles/ubuntu2004.docker +1 -1
@@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make"
Signature · 1 line
2.31.1
PATCH v2 5/6 tests/avocado: Do not run tests that require libslirp if it is not available
In reply to Thomas HuthSome avocado tests blindly assume that QEMU has been compiled with libslirp enabled and fail badly if it is missing. Add a proper check to cancel the tests in this case.
--- tests/avocado/avocado_qemu/__init__.py | 7 +++++++ tests/avocado/info_usernet.py | 1 + tests/avocado/replay_linux.py | 1 + 3 files changed, 9 insertions(+)
tests/avocado/avocado_qemu/__init__.py +7 -0
@@ -295,6 +295,12 @@ def require_accelerator(self, accelerator): self.cancel("%s accelerator does not seem to be " "available" % accelerator) + def require_netdev(self, netdevname): + netdevhelp = run_cmd([self.qemu_bin, + '-M', 'none', '-netdev', 'help'])[0]; + if netdevhelp.find('\n' + netdevname + '\n') < 0: + self.cancel('no support for user networking') + def _new_vm(self, name, *args): self._sd = tempfile.TemporaryDirectory(prefix="avo_qemu_sock_") vm = QEMUMachine(self.qemu_bin, base_temp_dir=self.workdir,
@@ -547,6 +553,7 @@ def _set_distro(self): def setUp(self, ssh_pubkey=None, network_device_type='virtio-net'): super().setUp() + self.require_netdev('user') self._set_distro() self.vm.add_args('-smp', self.smp) self.vm.add_args('-m', self.memory)
tests/avocado/info_usernet.py +1 -0
@@ -16,6 +16,7 @@ class InfoUsernet(QemuSystemTest): def test_hostfwd(self): + self.require_netdev('user') self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22') self.vm.launch() res = self.vm.command('human-monitor-command',
tests/avocado/replay_linux.py +1 -0
@@ -55,6 +55,7 @@ def vm_add_disk(self, vm, path, id, device): '%s,drive=disk%s-rr%s' % (device, id, bus_string)) def launch_and_wait(self, record, args, shift): + self.require_netdev('user') vm = self.get_vm() vm.add_args('-smp', '1') vm.add_args('-m', '1024')
Signature · 1 line
2.31.1
PATCH v2 6/6 Remove the slirp submodule (i.e. compile only with an external libslirp)
In reply to Thomas HuthSince QEMU 7.1 we don't support Ubuntu 18.04 anymore, so the last big important Linux distro that did not have a pre-packaged libslirp has been dismissed. All other major distros seem to have a libslirp package in their distribution already - according to repology.org:
Fedora 35: 4.6.1
CentOS 8 (RHEL-8): 4.4.0
Debian 11: 4.4.0
OpenSUSE Leap 15.3: 4.3.1
Ubuntu LTS 20.04: 4.1.0
FreeBSD Ports: 4.7.0
NetBSD pkgsrc: 4.7.0
Homebrew: 4.7.0
MSYS2 mingw: 4.7.0The only one that was still missing a libslirp package is OpenBSD - but the next version (OpenBSD 7.2 which will be shipped in October) is going to include a libslirp package. Since QEMU 7.2 will be published after OpenBSD 7.2, we should be fine there, too.
So there is no real urgent need for keeping the slirp submodule in the QEMU tree anymore. Thus let's drop the slirp submodule now and rely on the libslirp packages from the distributions instead.
--- configure | 24 ------- meson.build | 121 +++++++--------------------------- .gitlab-ci.d/buildtest.yml | 20 +++--- .gitmodules | 3 - MAINTAINERS | 1 - meson_options.txt | 5 +- scripts/archive-source.sh | 2 +- scripts/meson-buildoptions.sh | 4 +- slirp | 1 - 9 files changed, 34 insertions(+), 147 deletions(-) delete mode 160000 slirp
configure +0 -24
@@ -321,11 +321,6 @@ vfio_user_server="disabled" # are included in the automatically generated help message) # 1. Track which submodules are needed -if test "$default_feature" = no ; then - slirp="disabled" -else - slirp="auto" -fi fdt="auto" # 2. Automatically enable/disable other options
@@ -829,14 +824,6 @@ for opt do ;; --disable-tsan) tsan="no" ;; - --disable-slirp) slirp="disabled" - ;; - --enable-slirp) slirp="enabled" - ;; - --enable-slirp=git) slirp="internal" - ;; - --enable-slirp=*) slirp="$optarg" - ;; --disable-tcg) tcg="disabled" plugins="no" ;;
@@ -1828,16 +1815,6 @@ EOF fi fi -########################################## -# check for slirp - -case "$slirp" in - auto | enabled | internal) - # Simpler to always update submodule, even if not needed. - git_submodules="${git_submodules} slirp" - ;; -esac - ########################################## # functions to probe cross compilers
@@ -2746,7 +2723,6 @@ if test "$skip_meson" = no; then test "$fdt" != auto && meson_option_add "-Dfdt=$fdt" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engine=$LIB_FUZZING_ENGINE" test "$qemu_suffix" != qemu && meson_option_add "-Dqemu_suffix=$qemu_suffix" - test "$slirp" != auto && meson_option_add "-Dslirp=$slirp" test "$smbd" != '' && meson_option_add "-Dsmbd=$smbd" test "$tcg" != enabled && meson_option_add "-Dtcg=$tcg" test "$vfio_user_server" != auto && meson_option_add "-Dvfio_user_server=$vfio_user_server"
meson.build +22 -99
145 lines not on this page · raw message
.gitlab-ci.d/buildtest.yml +8 -12
@@ -41,8 +41,7 @@ build-system-ubuntu: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-slirp=system - --enable-capstone + CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-capstone TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build
@@ -120,7 +119,7 @@ build-system-fedora: variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle --enable-docs - --enable-fdt=system --enable-slirp=system --enable-capstone + --enable-fdt=system --enable-slirp --enable-capstone TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build
@@ -339,10 +338,8 @@ clang-user: # On gitlab runners, default value sometimes end up calling 2 lds concurrently and # triggers an Out-Of-Memory error # -# Since slirp callbacks are used in QEMU Timers, slirp needs to be compiled together -# with QEMU and linked as a static library to avoid false positives in CFI checks. -# This can be accomplished by using -enable-slirp=git, which avoids the use of -# a system-wide version of the library +# Since slirp callbacks are used in QEMU Timers, we cannot use libslirp with +# CFI builds, and thus have to disable it here. # # Split in three sets of build/check/avocado to limit the execution time of each # job
@@ -355,7 +352,7 @@ build-cfi-aarch64: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug - --enable-safe-stack --enable-slirp=git + --enable-safe-stack --disable-slirp TARGETS: aarch64-softmmu MAKE_CHECK_ARGS: check-build # FIXME: This job is often failing, likely due to out-of-memory problems in
@@ -395,7 +392,7 @@ build-cfi-ppc64-s390x: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug - --enable-safe-stack --enable-slirp=git + --enable-safe-stack --disable-slirp TARGETS: ppc64-softmmu s390x-softmmu MAKE_CHECK_ARGS: check-build # FIXME: This job is often failing, likely due to out-of-memory problems in
@@ -435,7 +432,7 @@ build-cfi-x86_64: AR: llvm-ar IMAGE: fedora CONFIGURE_ARGS: --cc=clang --cxx=clang++ --enable-cfi --enable-cfi-debug - --enable-safe-stack --enable-slirp=git + --enable-safe-stack --disable-slirp TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build timeout: 70m
@@ -469,7 +466,7 @@ tsan-build: variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 - --enable-trace-backends=ust --enable-fdt=system --enable-slirp=system + --enable-trace-backends=ust --enable-fdt=system --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=1
@@ -571,7 +568,6 @@ build-without-default-features: --disable-capstone --disable-pie --disable-qom-cast-debug - --disable-slirp --disable-strip TARGETS: avr-softmmu i386-softmmu mips64-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
.gitmodules +0 -3
@@ -46,9 +46,6 @@ [submodule "roms/edk2"] path = roms/edk2 url = https://gitlab.com/qemu-project/edk2.git -[submodule "slirp"] - path = slirp - url = https://gitlab.com/qemu-project/libslirp.git [submodule "roms/opensbi"] path = roms/opensbi url = https://gitlab.com/qemu-project/opensbi.git
MAINTAINERS +0 -1
@@ -2978,7 +2978,6 @@ F: include/hw/registerfields.h SLIRP M: Samuel Thibault <[email protected]> S: Maintained -F: slirp/ F: net/slirp.c F: include/net/slirp.h T: git https://people.debian.org/~sthibault/qemu.git slirp
meson_options.txt +2 -3
@@ -199,6 +199,8 @@ option('l2tpv3', type : 'feature', value : 'auto', description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') +option('slirp', type: 'feature', value: 'auto', + description: 'libslirp user mode network backend support') option('vde', type : 'feature', value : 'auto', description: 'vde network backend support') option('vmnet', type : 'feature', value : 'auto',
@@ -264,9 +266,6 @@ option('vduse_blk_export', type: 'feature', value: 'auto', option('capstone', type: 'feature', value: 'auto', description: 'Whether and how to find the capstone library') -option('slirp', type: 'combo', value: 'auto', - choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], - description: 'Whether and how to find the slirp library') option('fdt', type: 'combo', value: 'auto', choices: ['disabled', 'enabled', 'auto', 'system', 'internal'], description: 'Whether and how to find the libfdt library')
scripts/archive-source.sh +1 -1
@@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules="dtc slirp meson ui/keycodemapdb" +submodules="dtc meson ui/keycodemapdb" submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit=""
scripts/meson-buildoptions.sh +1 -3
@@ -35,8 +35,6 @@ meson_options_help() { printf "%s\n" ' --enable-qom-cast-debug cast debugging support' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u)random and' printf "%s\n" ' getrandom()' - printf "%s\n" ' --enable-slirp[=CHOICE] Whether and how to find the slirp library' - printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)' printf "%s\n" ' --enable-strip Strip targets on install' printf "%s\n" ' --enable-tcg-interpreter TCG with bytecode interpreter (slow)' printf "%s\n" ' --enable-trace-backends=CHOICES'
@@ -141,6 +139,7 @@ meson_options_help() { printf "%s\n" ' sdl-image SDL Image support for icons' printf "%s\n" ' seccomp seccomp support' printf "%s\n" ' selinux SELinux support in qemu-nbd' + printf "%s\n" ' slirp libslirp user mode network backend support' printf "%s\n" ' slirp-smbd use smbd (at path --smbd=*) in slirp networking' printf "%s\n" ' smartcard CA smartcard emulation support' printf "%s\n" ' snappy snappy compression support'
@@ -386,7 +385,6 @@ _meson_option_parse() { --disable-selinux) printf "%s" -Dselinux=disabled ;; --enable-slirp) printf "%s" -Dslirp=enabled ;; --disable-slirp) printf "%s" -Dslirp=disabled ;; - --enable-slirp=*) quote_sh "-Dslirp=$2" ;; --enable-slirp-smbd) printf "%s" -Dslirp_smbd=enabled ;; --disable-slirp-smbd) printf "%s" -Dslirp_smbd=disabled ;; --enable-smartcard) printf "%s" -Dsmartcard=enabled ;;
slirp deleted +0 -1
@@ -1 +0,0 @@ -Subproject commit 9d59bb775d6294c8b447a88512f7bb43f12a25a8
Signature · 1 line
2.31.1
Thomas Huth, le mer. 24 août 2022 17:11:16 +0200, a ecrit:
Quoted 4 lines
At the point in time we're going to release QEMU 7.2, all supported host OS distributions will have a libslirp package available, so there is no need anymore for us to ship the slirp submodule. Thus let's clean up the related tests and finally remove the submodule now.
Thanks!
Quoted 44 lines
v2:
- Added patches to clean up and adapt the tests
- Rebased the removal patch to the latest version of the master branchThomas Huth (6):
tests/docker: Update the debian-all-test-cross container to Debian 11 tests/vm: Add libslirp to the VM tests tests/lcitool/libvirt-ci: Update the lcitool module to the latest
version
tests: Refresh dockerfiles and FreeBSD vars with lcitool tests/avocado: Do not run tests that require libslirp if it is not
available
Remove the slirp submodule (i.e. compile only with an external
libslirp)configure | 24 ---- meson.build | 121 ++++-------------- .gitlab-ci.d/buildtest.yml | 20 ++- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/container-cross.yml | 1 - .gitmodules | 3 - MAINTAINERS | 1 - meson_options.txt | 5 +- scripts/archive-source.sh | 2 +- scripts/meson-buildoptions.sh | 4 +- slirp | 1 - tests/avocado/avocado_qemu/__init__.py | 7 + tests/avocado/info_usernet.py | 1 + tests/avocado/replay_linux.py | 1 + tests/docker/Makefile.include | 1 - .../dockerfiles/debian-all-test-cross.docker | 9 +- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- tests/vm/freebsd | 3 + tests/vm/haiku.x86_64 | 3 +- tests/vm/netbsd | 3 + 23 files changed, 64 insertions(+), 156 deletions(-) delete mode 160000 slirpSignature · 1 line
2.31.1
Signature · 4 lines
Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.
Quoted 9 lines · On Mittwoch, 24. August 2022 17:11:16 CEST Thomas Huth wrote:
At the point in time we're going to release QEMU 7.2, all supported host OS distributions will have a libslirp package available, so there is no need anymore for us to ship the slirp submodule. Thus let's clean up the related tests and finally remove the submodule now.
v2:
- Added patches to clean up and adapt the tests
- Rebased the removal patch to the latest version of the master branch
Quoted 10 lines
Thomas Huth (6):
tests/docker: Update the debian-all-test-cross container to Debian 11 tests/vm: Add libslirp to the VM tests tests/lcitool/libvirt-ci: Update the lcitool module to the latest
version
tests: Refresh dockerfiles and FreeBSD vars with lcitool tests/avocado: Do not run tests that require libslirp if it is not
available
Remove the slirp submodule (i.e. compile only with an external
libslirp)
And I was wondering (bisecting) why network silently stopped working here.
While I understand the motivation for this change, it's probably not a user friendly situation to just silently decease functionality. As slirp was the default networking (i.e. not just some exotic QEMU feature), wouldn't it make sense then to make missing libslirp a build-time error by default?
Best regards,
Christian Schoenebeck
Quoted 21 lines · Christian Schoenebeck
Quoted 9 lines · On Mittwoch, 24. August 2022 17:11:16 CEST Thomas Huth wrote:
At the point in time we're going to release QEMU 7.2, all supported host OS distributions will have a libslirp package available, so there is no need anymore for us to ship the slirp submodule. Thus let's clean up the related tests and finally remove the submodule now.
v2:
- Added patches to clean up and adapt the tests
- Rebased the removal patch to the latest version of the master branchQuoted 10 lines
Thomas Huth (6):
tests/docker: Update the debian-all-test-cross container to Debian 11 tests/vm: Add libslirp to the VM tests tests/lcitool/libvirt-ci: Update the lcitool module to the latest
version
tests: Refresh dockerfiles and FreeBSD vars with lcitool tests/avocado: Do not run tests that require libslirp if it is not
available
Remove the slirp submodule (i.e. compile only with an external
libslirp)
Quoted 6 lines
And I was wondering (bisecting) why network silently stopped working here.
While I understand the motivation for this change, it's probably not a user friendly situation to just silently decease functionality. As slirp was the default networking (i.e. not just some exotic QEMU feature), wouldn't it make sense then to make missing libslirp a build-time error by default?
See discussion here:
https://lore.kernel.org/qemu-devel/[email protected]/
and patch here:
https://lore.kernel.org/qemu-devel/[email protected]/
HTH,
Thomas