From nobody Thu Apr 13 06:00:19 2023
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 4PxppC4BNYz45WT4;
Thu, 13 Apr 2023 06:00:19 +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 4PxppC3ghWz40C6;
Thu, 13 Apr 2023 06:00:19 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681365619;
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=txI7EyQ4bb1Ubi6vCf8t+qRsc2ftEk4sf+sCTBpTsm0=;
b=GGwz2/rH2+OP1fXlrZqq7AyD+tFNEyXEJejlph+gaTZWbo5eaFk4rx5QdzofWHIXMe9iM/
REbrTaR6qpt6csk3/xZLRtHaD4GRnORxyCck++9AJ+zYwpOfO796k16qfo6bMUl0rF/MUq
ImvnpaFgUxKUsuf3N1QW59kthTCbiarK0G8BB8Bc9qpOSaLdFj8wNgL1WLh87rGKaNC7vK
Ccgn+LQbo7hc/CoXyR0bH4Jf2PsF3useLTsQKxM0JSM4IyEyXkha6yFjaUyPWX/OWzkso6
e9YSeS+gJ1wSXqrp0qyzB7Y7iWuEN6U/mLhSLWwSnfBwpS/iIodgpx/V+L4EmA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681365619;
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=txI7EyQ4bb1Ubi6vCf8t+qRsc2ftEk4sf+sCTBpTsm0=;
b=WkL/y8wId8RFs62jIzDNQtiUJsIdGX9wx2Qiy+25fHnX/KlUYCNExqP5W5//BZMj80DKvt
JFWISIbAXwh/2x8EZ4iRUvBKaKQ5RubsWShb1QfTROG8eRa564CNtHhdH5bWsw/BIoNRSE
ZeVVUcBGDOnXvMM+vPJmVj/oeMLsD9jlBOQFAq/uc2M5cbV/jR0B9ZlVYHu0NtPnjeoSqp
2Hv/FdM8PQ1xg95KZtV36TmiRsrpgch0VfHSvI9DPPrLCd1wksPKhL8yK9ztEy0gRRJqyH
vLLZ3xLE5PrRMvynFQuXFFpPBOfXiLs4tzsJHKLtkSblNFRQa2GMC+FACYvmRQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681365619; a=rsa-sha256; cv=none;
b=yClA3J7dQmt7B64IOTujBP7qL87R9p8yowb8h7QLMdXDNcoo61IQYUhK9e3eH2YGmwB9ZA
YIuZmnqqZ+yfQUMIh/zpvkMbSeHuha7WU3VeSnvRSLYUuxtdk2tIjHg4KVIyTGmCYzBISM
ravshIXZZVls/sOCnZcgHYVxTPC+caK+LLprunSSjUzuH1kdCTqtDYrObsvCSTeM/MBw2O
jRzb+UlsFGcVtXZoPP5/xzxW/ePaQC9hc3vJq8atFOu72HZh1hRHebkBjO2/Dr6c62TQYn
AXPoQQow6ETWLCZDDCjwBHnrk3TLulBfLAY2mmplpAckoHXmSclLn0mHfPeNsA==
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 4PxppC2nYmzWPY;
Thu, 13 Apr 2023 06:00:19 +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 33D60JDn027004;
Thu, 13 Apr 2023 06:00:19 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33D60JiW027003;
Thu, 13 Apr 2023 06:00:19 GMT
(envelope-from git)
Date: Thu, 13 Apr 2023 06:00:19 GMT
Message-Id: <202304130600.33D60JiW027003@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?= <corvink@FreeBSD.org>
Subject: git: 158adced65f8 - main - bhyve: save softc of ACPI devices
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@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: corvink
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 158adced65f844682d26e1e64f247de94212f135
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by corvink:
URL: https://cgit.FreeBSD.org/src/commit/?id=158adced65f844682d26e1e64f247de94212f135
commit 158adced65f844682d26e1e64f247de94212f135
Author: Corvin Köhne <corvink@FreeBSD.org>
AuthorDate: 2022-07-22 08:15:28 +0000
Commit: Corvin Köhne <corvink@FreeBSD.org>
CommitDate: 2023-04-13 06:00:09 +0000
bhyve: save softc of ACPI devices
This will be useful for writing device specific ACPI tables or DSDT
methods.
Reviewed by: markj
MFC after: 1 week
Sponsored by: Beckhoff Automation GmbH & Co. KG
Differential Revision: https://reviews.freebsd.org/D39322
---
usr.sbin/bhyve/acpi_device.c | 13 ++++++++++++-
usr.sbin/bhyve/acpi_device.h | 7 +++++--
usr.sbin/bhyve/qemu_fwcfg.c | 2 +-
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c
index 51603e138fba..e37fc50b8c91 100644
--- a/usr.sbin/bhyve/acpi_device.c
+++ b/usr.sbin/bhyve/acpi_device.c
@@ -36,18 +36,20 @@ struct acpi_resource_list_entry {
* Holds information about an ACPI device.
*
* @param vm_ctx VM context the ACPI device was created in.
+ * @param softc A pointer to the software context of the ACPI device.
* @param emul Device emulation struct. It contains some information like the
name of the ACPI device and some device specific functions.
* @param crs Current resources used by the ACPI device.
*/
struct acpi_device {
struct vmctx *vm_ctx;
+ void *softc;
const struct acpi_device_emul *emul;
SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs;
};
int
-acpi_device_create(struct acpi_device **const new_dev,
+acpi_device_create(struct acpi_device **const new_dev, void *const softc,
struct vmctx *const vm_ctx, const struct acpi_device_emul *const emul)
{
assert(new_dev != NULL);
@@ -60,6 +62,7 @@ acpi_device_create(struct acpi_device **const new_dev,
}
dev->vm_ctx = vm_ctx;
+ dev->softc = softc;
dev->emul = emul;
SLIST_INIT(&dev->crs);
@@ -136,6 +139,14 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev,
return (0);
}
+void *
+acpi_device_get_softc(const struct acpi_device *const dev)
+{
+ assert(dev != NULL);
+
+ return (dev->softc);
+}
+
int
acpi_device_build_table(const struct acpi_device *const dev)
{
diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h
index 4d734b422ec5..32e299f2da86 100644
--- a/usr.sbin/bhyve/acpi_device.h
+++ b/usr.sbin/bhyve/acpi_device.h
@@ -38,13 +38,14 @@ struct acpi_device_emul {
* Creates an ACPI device.
*
* @param[out] new_dev Returns the newly create ACPI device.
+ * @param[in] softc Pointer to the software context of the ACPI device.
* @param[in] vm_ctx VM context the ACPI device is created in.
* @param[in] emul Device emulation struct. It contains some information
* like the name of the ACPI device and some device specific
* functions.
*/
-int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx,
- const struct acpi_device_emul *emul);
+int acpi_device_create(struct acpi_device **new_dev, void *softc,
+ struct vmctx *vm_ctx, const struct acpi_device_emul *emul);
void acpi_device_destroy(struct acpi_device *dev);
int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port,
@@ -52,5 +53,7 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port,
int acpi_device_add_res_fixed_memory32(struct acpi_device *dev,
UINT8 write_protected, UINT32 address, UINT32 length);
+void *acpi_device_get_softc(const struct acpi_device *dev);
+
int acpi_device_build_table(const struct acpi_device *dev);
int acpi_device_write_dsdt(const struct acpi_device *dev);
diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c
index ddd73d06d34d..af819dc4a952 100644
--- a/usr.sbin/bhyve/qemu_fwcfg.c
+++ b/usr.sbin/bhyve/qemu_fwcfg.c
@@ -401,7 +401,7 @@ qemu_fwcfg_init(struct vmctx *const ctx)
* tables and register io ports for fwcfg, if it's used.
*/
if (strcmp(lpc_fwcfg(), "qemu") == 0) {
- error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx,
+ error = acpi_device_create(&fwcfg_sc.acpi_dev, &fwcfg_sc, ctx,
&qemu_fwcfg_acpi_device_emul);
if (error) {
warnx("%s: failed to create ACPI device for QEMU FwCfg",