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

-- 
2.31.1

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
> 
> 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

On 30/09/2022 18.50, Christian Schoenebeck wrote:
> 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
>>
>> 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?

See discussion here:

 
https://lore.kernel.org/qemu-devel/a25c238b-dabd-bf20-9aee-7cda4e422536@redhat.com/

and patch here:

 
https://lore.kernel.org/qemu-devel/20220929163237.1417215-1-marcandre.lureau@redhat.com/

  HTH,
   Thomas

Thomas Huth, le mer. 24 août 2022 17:11:16 +0200, a ecrit:
> 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.

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Thanks!

> 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
> 
> -- 
> 2.31.1
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.