From nobody Wed Apr 10 15:18:59 2024 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 4VF61J04Rhz5HHGj; Wed, 10 Apr 2024 15:19:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VF61H578Xz4mpG; Wed, 10 Apr 2024 15:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762339; 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=ShvJBMhnqxpmTUNYlS65I32tTdj0BgGUse/zO9pfYgg=; b=VCA2m2Qrb356xfjHEZZnUgmB0xFMFqI/zrcs0hnUitlz0YZry632zI5YmdRf8svUNxtNwr EYs0ybqkm3gWOeyZcEvqCo1A2HI9oVrkPS9kpH9XcEQw+Q5wyidaZGUtUdDbbNyaa9eEqE 53PUhZKrMaMo/DmYNndpQ3rW5OgtCTooQ18klpPhElKHUg0amwPFKNLG23VTcGN8kAx2L4 9ztRJD1/7jJwLkpXu69ID8+cl1P0ptOl2Ai8nx579pUJ2bzABxzpa03CtzMI1KGTQ9FR1b Sme+aMH42B5c2yilja/x646ttVdjPnE/IfZh9qM2idBSqdnn+MPFPpOo0w6RLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762339; a=rsa-sha256; cv=none; b=ctQoHZUQZv17vdKEQh5q/ewTjnAkx+p8qZ32RbEvA4+uDymUWfDC42gNXi69m236wdT6Gn ZRcQ3UL+fD+2FuNML7OepE6XrcjJMCwmoimZWv2jfGM4p4el8vbhGhVXJzKFI8cKY/oeJF +VI34+m56B/D+idlCLvotGdDVZXzB7DXT6efa5LI+nLhAoN3SSEQ0bAlprFUbWIqI/rMpp U1++8v+FhbrDOqWfVt4yknrHZBjG/1M9Sn5ZzFTHAKmNzKjOkA6Jq1HtRouT9naOZ1AMHM z7Rb4ZXqSaILX0QwCVARE7Xy0M17eES76GOf8JeU0OJywwABfNaoQA2zzuMZzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762339; 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=ShvJBMhnqxpmTUNYlS65I32tTdj0BgGUse/zO9pfYgg=; b=Lt2MhWkjYm/vwcO8CdPcxuqIZA29bljhbfXawQPRihzHsqizAbwwV1ZPYEGYleIJjaZ2CE YC60nkMK3BXxyQPCGqGOtjTjgRJrvIs1IfaNmjmdw4tRwtlfxqz+JJWRL+PiZCZkRXTmDw vR+UZQBR8mNzRQHIstX52VZKICgyyhbPwTlTsr8CxHozkxG/ptf+lYlCDobw8g7i5F0tZ3 sA7REUBZpeFEei0WcrIL5aKOap3gISpCucK1rFMxw6ECwIRBfceR/PRmGRKzjUdBHR0E/a RN6jw2USjqyt0VMUfJY+7i0jM9XoDtg7WGm6B8cDm3LkLz9XnvIul8PxlzR51A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VF61H4kjRzjsH; Wed, 10 Apr 2024 15:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43AFIxto092533; Wed, 10 Apr 2024 15:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFIxw9092530; Wed, 10 Apr 2024 15:18:59 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:18:59 GMT Message-Id: <202404101518.43AFIxw9092530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d878f72a73e1 - main - bhyve: Provide optional libfdt linking 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: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: 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: d878f72a73e104b705d7ee07a3152ad841eadf05 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d878f72a73e104b705d7ee07a3152ad841eadf05 commit d878f72a73e104b705d7ee07a3152ad841eadf05 Author: Mark Johnston AuthorDate: 2024-04-03 16:48:45 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:55 +0000 bhyve: Provide optional libfdt linking The arm64 port currently does not support ACPI, it instead builds up an FDT which is exported to the guest. This mechanism will not be used on amd64 but isn't really arm64-specific either, so provide an opt-in mechanism to link libfdt. No functional change intended. Reviewed by: corvink, jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40995 --- usr.sbin/bhyve/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 03ea77769754..efa5b4acf897 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -70,6 +70,11 @@ SRCS+= snapshot.c .include "${MACHINE_CPUARCH}/Makefile.inc" +.if defined(BHYVE_FDT_SUPPORT) +LIBADD+= fdt +CFLAGS+= -I${SRCTOP}/sys/contrib/libfdt +.endif + .if defined(BHYVE_GDB_SUPPORT) SRCS+= gdb.c CFLAGS+= -DBHYVE_GDB @@ -83,7 +88,7 @@ CFLAGS+=-I${.CURDIR} \ -I${.CURDIR}/../../contrib/lib9p \ -I${SRCTOP}/sys -LIBADD= vmmapi md nv pthread z util sbuf cam 9p +LIBADD+= vmmapi md nv pthread z util sbuf cam 9p .if ${MK_BHYVE_SNAPSHOT} != "no" LIBADD+= ucl xo