From nobody Wed Nov 30 10:08:23 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 4NMZfH3kXZz4jW3s; Wed, 30 Nov 2022 10:08:23 +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 4NMZfH3369z4L0y; Wed, 30 Nov 2022 10:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669802903; 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=yiFxUen7DVYMQ7KE1l4LHB/aYdACi7M6pDlueSJgjIA=; b=gUzsPLZHbfQMHhNW9nTrcV8eyodXHQlZ/J6EXufX0P+J03BZL8qjkWltm7iBnZapk7jGY3 MofV89TOoUyK4vh3cbGyzCF1wP3PYZqZ2fBv7xyeirFYVHl7e3fp62NKHloO0SmHmuNNQZ 7P+LMoP90AGeHwLxMDJQ8pX1QWF2v3qcTwZdk1Ih3/n0gd2Au/eCQbwbbaaigsDJoQQuxg MRkjgEhfYYnUsnjo+dlnUFNlSVROUadmLk5V5896ZCG2dtmvbbVIrIp18QQlz0Wn0RqCSh HS3Uf/1HmPw1ucX24CErH31gX0o5Y6wGqp+NgDMKNrODrOQbHSciT9GDsbMb9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669802903; 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=yiFxUen7DVYMQ7KE1l4LHB/aYdACi7M6pDlueSJgjIA=; b=U5OfUQTuM/rpwp8rAfucnOVAoQ/1GDfl7X9MUBxWW3AaEXOyNnHhEakxd29kDXpIoe50ZJ smmIEUASY6oTx7nnn7qRMOrd14Rkoi25MWLXcC0ZWym6wfLXm1uDkk9gvaeXGB0hg5Pzig nHV3CaICs+AhvG1WsVS85m57sLbKmPeLtnuGmIVFApWRw3LOkegqi7LpjQAok+LIstEkXw Gbu7qRO9QHJqdmDBy5KYq9QetWeHtSRtXfbqnh8sG0Peqn82lmWLXKYz85d18RrUT3LX2Z y2XUhu239lTA9AJw8lstRT1JrC4VIaPayGMTvJw7RJLUkAy7ru79Vbwj+ILs1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669802903; a=rsa-sha256; cv=none; b=JbcRhJHN5PU6PVCxrJHboBsceX3/qiVbvH6dbEInBLjQMLSKVX0MM9WwjyS3S8LnPSsn7D mx4KdVRuwLgl3w1b9nXO5SADmhnReZrs66ta7JWOrf5Pv6/ygFUo/mktCxwygNjZ+ZmEn2 w1I4xhlMpM/bmZTWZifTMV6VGbr5zrhMkrr0Okb7QiQs9cXl9FlvKkWDFD0ujT3aZ9+wul 13F3WJS6+0P/JITchBfAs8GzC6bT834Ekaht1L6zvekGIN0CVkQCOVo+HXWZO62vBqfvCI iUJY/8NycH4zTdYllwtjUHnh929+4tHxGEOSg0uyby2jdFr8ZQrmb+rCKJrAGw== 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 4NMZfH25fCzsr8; Wed, 30 Nov 2022 10:08:23 +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 2AUA8N4C050857; Wed, 30 Nov 2022 10:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUA8NbF050856; Wed, 30 Nov 2022 10:08:23 GMT (envelope-from git) Date: Wed, 30 Nov 2022 10:08:23 GMT Message-Id: <202211301008.2AUA8NbF050856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 703a8a710030 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 703a8a710030ca23688ba364ae61bd34a2482447 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=703a8a710030ca23688ba364ae61bd34a2482447 commit 703a8a710030ca23688ba364ae61bd34a2482447 Author: Corvin Köhne AuthorDate: 2022-04-06 09:10:40 +0000 Commit: Corvin Köhne CommitDate: 2022-11-30 07:03:49 +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 (cherry picked from commit b922cf4fe340bc48355fdde8823dc472841445b3) --- 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 ac157505b7ba..b6c9bb20eca3 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());