From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Thu, 16 Mar 2023 15:32:28 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pcoeZ-002lEl-9H
	for lore@lore.pengutronix.de; Thu, 16 Mar 2023 15:32:28 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1pcoeZ-0005OV-1E; Thu, 16 Mar 2023 15:32:27 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pcodj-0003oF-7O; Thu, 16 Mar 2023 15:31:35 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pcodi-004ZQt-JB; Thu, 16 Mar 2023 15:31:34 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pcodh-00FSQf-Kh; Thu, 16 Mar 2023 15:31:33 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Thu, 16 Mar 2023 15:31:33 +0100
Message-Id: <20230316143133.3684114-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230312185306.2402677-2-rhi@pengutronix.de>
References: <20230312185306.2402677-2-rhi@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] qemu,
 host-qemu: re-enable user networking via libslirp
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 506aa4ff4a97f697fee79c457b928efaae4b8aec.

Michael

[sent from post-receive hook]

On Thu, 16 Mar 2023 15:31:33 +0100, Roland Hieber <rhi@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 <rhi@pengutronix.de>
> Message-Id: <20230312185306.2402677-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@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 \