From nobody Mon Nov 24 14:29:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dFSr332kdz6HHXG for ; Mon, 24 Nov 2025 14:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFSr313lcz3bp1 for ; Mon, 24 Nov 2025 14:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763994547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eA6ZwYW4ZLoiSGixi8nbWjNelpufec+c1zSa1i5o6A=; b=sGml5gXTG+7/Ae7FiPlPOXMpxwigHues7YHPA7vK5TbT9mpD+rWlbdA3JN5q1oKBnlN/5f +TyVolCv8PRjS6bmBPaAIjHS9eTqryL9eoNBXOYjPEpxMLAdZ5rhe+9IqHBDz2zqceS2KE sE/sV827Ry6nDGsauCEFEZRnZC3C2B3mbiwW84xSDqizgYg20Dec0YXr07oFsUXuPcGo+0 NQMcEFAQLh/IwOF8iFHPWtBy9RHlmD38oo1XyZ222F/EMCUx9aSUgZeinsAMZRl33lcJVJ l2g59Gkcc97TzPzhofxMY2BmZf8nzo35fhU2hYor8tMMcVyFOI8Qy/Y+Z0Qiww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763994547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eA6ZwYW4ZLoiSGixi8nbWjNelpufec+c1zSa1i5o6A=; b=hY1URR1Qlk2k8GsAKsm3WaIBDh6Kjb5p8QjZY41j8KPBOmdlRW1I2Ii+pub+bwk+z3+mfF gYZG86kGl96NoTDFTkzCAsEOO4ChPgIW/cLilxIEZoXOeeiG+LA/Nn7pdBsJ6PhjOKS4YN t4U1zNTOfNv0hz9nGrN6d+2h8LnikxBPoO8KXKqonsEecwCSXRPhNh7E/K1ZRITn3IUHo7 zr9donq2MtCg4B1PQhp5w14qwumH05t/xO51nl46QeCrG4hjzI5GJ3gGUXfAgmXTzeBaXF bT6TEFcQXC9zaXQAwftapgl4qvJmJo9JfhqEj57n3yaqzarXQC9Xwo5uHjYPIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763994547; a=rsa-sha256; cv=none; b=fh/z/I1KXiqubEJTFzm3TEEO4BSja2Ge7GvJU/WVdwmZnr+mD5P+GZqqT3TwxPwEXyn6+e SZJ0CPraaPUArBPXwJK61UV2YqO+igoMkIGfWJsnv4zK4ge1tNkLNu9HogbI8B5z3qtc9Q LeEg4SryTBJ4Tok9Bn0tmHqP1k5lfwG89bi8cfDg3atzz0gMePBDSEbE90+EiliWNRTvjj tmxT1klMOp6lJEg9+OVQrtdXb7cQIWNHHJUmrlILtc8bPCi2mxb2wP3V9aPR98d01s+Icu wkwbIKv0Z/KtEBWbXUQapwuTJgpbqh6uUdF8V0UdQQF5MYQQgLEHSzUgSVmf8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFSr30Qpcz3V4 for ; Mon, 24 Nov 2025 14:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2c1d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 14:29:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: bac572b2b1c9 - main - bhyve/slirp: Avoid a nested declaration of environ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bac572b2b1c9aec0ebfd3ae1fd02b314984cb716 Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 14:29:07 +0000 Message-Id: <69246bb3.2c1d4.19bb91f6@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bac572b2b1c9aec0ebfd3ae1fd02b314984cb716 commit bac572b2b1c9aec0ebfd3ae1fd02b314984cb716 Author: Mark Johnston AuthorDate: 2025-11-24 14:08:21 +0000 Commit: Mark Johnston CommitDate: 2025-11-24 14:28:42 +0000 bhyve/slirp: Avoid a nested declaration of environ Fixes: 0e62ebd20172 ("bhyve: Move the slirp backend out into a separate process") --- usr.sbin/bhyve/net_backend_slirp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/net_backend_slirp.c b/usr.sbin/bhyve/net_backend_slirp.c index c98e54b2ee88..f2b483c5e314 100644 --- a/usr.sbin/bhyve/net_backend_slirp.c +++ b/usr.sbin/bhyve/net_backend_slirp.c @@ -73,11 +73,12 @@ struct slirp_priv { struct mevent *mevp; }; +extern char **environ; + static int slirp_init(struct net_backend *be, const char *devname __unused, nvlist_t *nvl, net_be_rxeof_t cb, void *param) { - extern char **environ; struct slirp_priv *priv = NET_BE_PRIV(be); nvlist_t *config; posix_spawn_file_actions_t fa;