From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Sun, 12 Mar 2023 19:54:07 +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 ) id 1pbQpa-001Ws0-4Q for lore@lore.pengutronix.de; Sun, 12 Mar 2023 19:54:07 +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 ) id 1pbQpZ-000133-DR; Sun, 12 Mar 2023 19:54:05 +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 ) id 1pbQot-0000tW-A2; Sun, 12 Mar 2023 19:53:23 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pbQos-003gGu-M2; Sun, 12 Mar 2023 19:53:22 +0100 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pbQor-00A541-MU; Sun, 12 Mar 2023 19:53:21 +0100 From: Roland Hieber To: ptxdist@pengutronix.de Date: Sun, 12 Mar 2023 19:53:08 +0100 Message-Id: <20230312185306.2402677-2-rhi@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230312185306.2402677-1-rhi@pengutronix.de> References: <20230312185306.2402677-1-rhi@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 2/2] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" 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 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 --- rules/host-qemu.in | 1 + rules/host-qemu.make | 1 + rules/qemu.in | 1 + rules/qemu.make | 1 + 4 files changed, 4 insertions(+) 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 \ -- 2.30.2