Version 4.7 of slirp provides a new timer API that works better with CFI,
together with several other improvements:

* Allow disabling the internal DHCP server !22
* Support Unix sockets in hostfwd !103
* IPv6 DNS proxying support !110
* bootp: add support for UEFI HTTP boot !111

and bugfixes.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 slirp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/slirp b/slirp
index a88d9ace23..3ad1710a96 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0
+Subproject commit 3ad1710a96678fe79066b1469cead4058713a1d9
-- 
2.35.1

On Thu, May 5, 2022 at 1:06 AM Paolo Bonzini <pbonzini@redhat.com> wrote:

> Version 4.7 of slirp provides a new timer API that works better with CFI,
> together with several other improvements:
>
> * Allow disabling the internal DHCP server !22
> * Support Unix sockets in hostfwd !103
> * IPv6 DNS proxying support !110
> * bootp: add support for UEFI HTTP boot !111
>
> and bugfixes.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  slirp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/slirp b/slirp
> index a88d9ace23..3ad1710a96 160000
> --- a/slirp
> +++ b/slirp
> @@ -1 +1 @@
> -Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0
> +Subproject commit 3ad1710a96678fe79066b1469cead4058713a1d9
> --
> 2.35.1
>
>
>

-- 
Marc-André Lureau

On Thu, May 5, 2022 at 10:21 AM Marc-André Lureau
<marcandre.lureau@gmail.com> wrote:
>
>
>
> On Thu, May 5, 2022 at 1:06 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> Version 4.7 of slirp provides a new timer API that works better with CFI,
>> together with several other improvements:
>>
>> * Allow disabling the internal DHCP server !22
>> * Support Unix sockets in hostfwd !103
>> * IPv6 DNS proxying support !110
>> * bootp: add support for UEFI HTTP boot !111
>>
>> and bugfixes.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Unfortunately this fails to build on Windows due to a libslirp bug
(https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/121).
We could include the couple extra commits in QEMU, since there are no
other changes to libslirp since 4.7.0 and they only fix a compiler
warning; or wait for 4.7.1 to be released; or resuscitate the patches
that switch libslirp to a subproject, but that's my least favorite
because we're going to remove the bundled source code anyway sooner or
later.

Paolo

Hi

On Thu, May 5, 2022 at 12:34 PM Paolo Bonzini <pbonzini@redhat.com> wrote:

> On Thu, May 5, 2022 at 10:21 AM Marc-André Lureau
> <marcandre.lureau@gmail.com> wrote:
> >
> >
> >
> > On Thu, May 5, 2022 at 1:06 AM Paolo Bonzini <pbonzini@redhat.com>
> wrote:
> >>
> >> Version 4.7 of slirp provides a new timer API that works better with
> CFI,
> >> together with several other improvements:
> >>
> >> * Allow disabling the internal DHCP server !22
> >> * Support Unix sockets in hostfwd !103
> >> * IPv6 DNS proxying support !110
> >> * bootp: add support for UEFI HTTP boot !111
> >>
> >> and bugfixes.
> >>
> >> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> >
> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Unfortunately this fails to build on Windows due to a libslirp bug
> (https://gitlab.freedesktop.org/slirp/libslirp/-/merge_requests/121).
> We could include the couple extra commits in QEMU, since there are no
> other changes to libslirp since 4.7.0 and they only fix a compiler
> warning; or wait for 4.7.1 to be released; or resuscitate the patches
> that switch libslirp to a subproject, but that's my least favorite
> because we're going to remove the bundled source code anyway sooner or
> later.
>

Sad the CI didn't catch it. What is missing to cover it?

To me it's fine to update the submodule to the fixed commit, with a comment
explaining why.

-- 
Marc-André Lureau

On Thu, May 5, 2022 at 10:38 AM Marc-André Lureau
<marcandre.lureau@gmail.com> wrote:
> Sad the CI didn't catch it. What is missing to cover it?

The QEMU CI did, but the slirp one didn't because -Wmissing-prototypes
is not included in -Wall.

> To me it's fine to update the submodule to the fixed commit, with a comment explaining why.

Ok, thanks.