From nobody Wed Nov 16 11:47:54 2022 X-Original-To: dev-commits-src-all@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 4NC1Wb0b4bz4hhMC; Wed, 16 Nov 2022 11:47:55 +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 4NC1WZ6KbYz4FG7; Wed, 16 Nov 2022 11:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668599274; 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=B0XStKsih4KiKlktaTwS0P8GDl9NewrxdFAnqQopS64=; b=EqnT3Fm07EjMEIHp5mPi+BYmUILzCL0giU0BRrd0toSpTAqfrFw4zdPCsO7LIf3Q+doebq goE9gc9CQ8gCw6+aMwTUcrVlEHBS832E82lG8h99ovQNm8yRcB/wbbQDvFa0L7iEZCA/x7 0mNaViQjyKS3zPsNKGpQj/hxZeg9mwPGvSWB7rbeUh3ZWAxCq2fQPJAN7/PZYnXdBmjiwU wbJEHujXf1Lwq3bj/CAloSjOFIsNwit3FxNOo5B+a4KFW6B39GzNBLy2wBPE7Wu53LOkJt YrTqeJZiuk8GmW4Xj7NwnuHDVwUfFsWSUYTmm5pxrUTNKkF6r7amQr5WGIEy+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668599274; 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=B0XStKsih4KiKlktaTwS0P8GDl9NewrxdFAnqQopS64=; b=MNu8zotbYUR034Ac9ZUVVGIEpdpPTwtDHfY6UWTOOEtrUHg1eTBR/jCQ1Z1XZjteGJ3iSo zpeTp8lX8GjofeTIG52I6r1dukxbC+7fDxZ0sp6yBl1YBz/slFg0Pcf6Y7vxfIZOAXjiCR /4FdLsUG710oi2VaUYkole8Y28CMn1Lc+KlCfJRo9E8a18pVzD2lm9OHC+gR4v/ZQdQkse i5wMonuqnELViVx3EgpKktYpRWDK7sqAmRdPSYLi0HDlzvNaeRjWTrZ8x8U8GTts6wRsvf zHBFgDdqJeWCtyqEvNyGZueElhCx3dfCjcQpKPktG0z2LLIwzEXlrRIw1Y0U8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668599274; a=rsa-sha256; cv=none; b=g5wVIbfy+Oa4c/nB+xEyXWcfqh6+6fR5PIGhXPmP0SvGWY92tcsv734vx17WKB57G07mL+ t1cvFyh5gyy2nR9ZMYrdZLlogNeIUs4vBklQ90kBIPmcEnRkEz6KArwZzNztbrhZNbm9pL i0sV66VuDIbwEwy3tbd2Oi/xhB8xb9yVBmqfJxbwXO1SMNsM3SOId3ejhzNTkJc2T+9FtF QDbi82JdSbUWwpFJVA010U33S4YM+3dlpDKssA4ebhme1Vk7Ka0Kr7G4BJ+hcSq1mxMO7n E3W5cz/PJH76uhv99tkfaRd01RJQYePotP1Q/DzkB5d/SAVjOd/qzgQ216IFXw== 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 4NC1WZ5HDsz114S; Wed, 16 Nov 2022 11:47:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AGBlsUo066402; Wed, 16 Nov 2022 11:47:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AGBlsdV066401; Wed, 16 Nov 2022 11:47:54 GMT (envelope-from git) Date: Wed, 16 Nov 2022 11:47:54 GMT Message-Id: <202211161147.2AGBlsdV066401@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b922cf4fe340 - main - bhyve: build DSDT table by basl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b922cf4fe340bc48355fdde8823dc472841445b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b922cf4fe340bc48355fdde8823dc472841445b3 commit b922cf4fe340bc48355fdde8823dc472841445b3 Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:40 +0000 Commit: Corvin Köhne CommitDate: 2022-11-16 11:43:41 +0000 bhyve: build DSDT table by basl Building the DSDT table by basl will allow it to be loaded by qemu's ACPI table loader. Building the DSDT is complex and basl doesn't support it yet. For that reason, it's still compiled by iasl. It's just a bit restructured. Upcoming commits will restructure the builds of all other ACPI tables in a similar way. So, this commit is done for consistency reasons. We're starting with DSDT because it doesn't point to any other tables and it's the last one in our current build list. Reviewed by: jhb, markj (older version) Approved by: manu (mentor) MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36993 --- usr.sbin/bhyve/acpi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index e823d2d41357..35420c42fde0 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -952,6 +952,14 @@ basl_make_templates(void) return (err); } +static int +build_dsdt(struct vmctx *const ctx) +{ + BASL_EXEC(basl_compile(ctx, basl_fwrite_dsdt, DSDT_OFFSET)); + + return (0); +} + int acpi_build(struct vmctx *ctx, int ncpu) { @@ -993,7 +1001,7 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(basl_compile(ctx, basl_fwrite_hpet, HPET_OFFSET)); BASL_EXEC(basl_compile(ctx, basl_fwrite_mcfg, MCFG_OFFSET)); BASL_EXEC(basl_compile(ctx, basl_fwrite_facs, FACS_OFFSET)); - BASL_EXEC(basl_compile(ctx, basl_fwrite_dsdt, DSDT_OFFSET)); + BASL_EXEC(build_dsdt(ctx)); BASL_EXEC(basl_finish());