Thanks, applied as 506aa4ff4a97f697fee79c457b928efaae4b8aec. Michael
[sent from post-receive hook] On Thu, 16 Mar 2023 15:31:33 +0100, Roland Hieber <r...@pengutronix.de> wrote: > In qemu 7.2, the bundled libslirp necessary for user networking was > removed [1], and as such '-netdev user,…' parameters will no longer > work. User networking needs no infrastructure and is therefore nice to > have for ad-hoc virtual machines, so re-enable it by building against > libslirp. > > [1]: https://wiki.qemu.org/ChangeLog/7.2#SLIRP_module_(user-mode_networking) > > Fixes: e3060a69c0190dfa7131 (2022-12-15, "qemu: Version bump. 7.1.0 -> 7.2.0") > Signed-off-by: Roland Hieber <r...@pengutronix.de> > Message-Id: <20230312185306.2402677-2-...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/host-qemu.in b/rules/host-qemu.in > index 1456d1050611..e8fa17e29a1c 100644 > --- a/rules/host-qemu.in > +++ b/rules/host-qemu.in > @@ -6,6 +6,7 @@ menuconfig HOST_QEMU > prompt "host-side qemu " > select HOST_GLIB > select HOST_LIBCAP_NG > + select HOST_LIBSLIRP > select HOST_ZLIB > select HOST_SYSTEM_PYTHON3 > select HOST_LIBUSB if HOST_QEMU_SYS > diff --git a/rules/host-qemu.make b/rules/host-qemu.make > index 6b0651731f2f..dcbc18df6d16 100644 > --- a/rules/host-qemu.make > +++ b/rules/host-qemu.make > @@ -120,6 +120,7 @@ HOST_QEMU_CONF_OPT := \ > --disable-sdl-image \ > --disable-seccomp \ > --disable-selinux \ > + --enable-slirp \ > --disable-smartcard \ > --disable-snappy \ > --disable-sparse \ > diff --git a/rules/qemu.in b/rules/qemu.in > index 30f1cc2f5989..6524013e6e69 100644 > --- a/rules/qemu.in > +++ b/rules/qemu.in > @@ -9,6 +9,7 @@ menuconfig QEMU > select GCCLIBS_CXX > select GLIB > select LIBCAP_NG > + select LIBSLIRP > select ZLIB > select SDL2 if QEMU_SDL > select GTK if QEMU_GTK > diff --git a/rules/qemu.make b/rules/qemu.make > index 79be513c666d..813bef742e2c 100644 > --- a/rules/qemu.make > +++ b/rules/qemu.make > @@ -118,6 +118,7 @@ QEMU_CONF_OPT := \ > --disable-sdl-image \ > --disable-seccomp \ > --disable-selinux \ > + --enable-slirp \ > --disable-smartcard \ > --disable-snappy \ > --disable-sparse \
