Re: [PATCH 3/5] net: slirp: switch to slirp_new

[Daniel P . Berrangé]

On Thu, May 05, 2022 at 10:29:07AM +0200, Paolo Bonzini wrote:
> On Thu, May 5, 2022 at 10:20 AM Marc-André Lureau
> <marcandre.lureau@gmail.com> wrote:
> >
> > Hi
> >
> > On Thu, May 5, 2022 at 1:07 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> >>
> >> Replace slirp_init with slirp_new, so that a more recent cfg.version
> >> can be specified.
> >
> >
> > It was introduced in v4.1.0, but I don't see a minimum libslirp version 
> > check.
> 
> In fact 4.3.0 is needed for version 3 of the struct, so the following
> needs to be
> squashed:
> 
> diff --git a/meson.build b/meson.build
> index 11876f5141..c902dfabd3 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2638,7 +2638,7 @@ if have_system
>    if slirp_opt in ['enabled', 'auto', 'system']
>      have_internal = fs.exists(meson.current_source_dir() / 
> 'slirp/meson.build')
>      slirp = dependency('slirp', kwargs: static_kwargs,
> -                       method: 'pkg-config',
> +                       method: 'pkg-config', version: '>=4.3.0',

Adding a dep on version 4.3.0 is not desirable. Ubuntu 20.04 has
version 4.1.0, and we want to be able to drop slirp submodule
when we drop Ubuntu 18.04 (hopfully in this dev cycle).


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