From nobody Mon Nov 21 08:31:35 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 4NG0wl4pZLz4j437; Mon, 21 Nov 2022 08:31:35 +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 4NG0wl4P1jz3Lxv; Mon, 21 Nov 2022 08:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669019495; 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=wsbZKRbJPUASMOvirbG14VMfLoF+hLkblrWtO9JiVTM=; b=qiV1dKJCi2/5uWgcUQuu5Hm8/Zt5ektp0p7xTCTjtARct96dNMM+chckiASgbpkfyFE/r/ tFJtwFrDvXUBY8unojq0uwSMUT1S5NBJeQ4mCY8SxL8vsGvMKtz7SygP2KherZMNeT//Ge wSaRgRiUtIElSolz1MaNZUKhPsvUEun2lhu/6x3lLtgE2k0Jj50zEoXJe/s6D74hDokyjQ 0fOYR8gomo9yWgeL8P1ySsuAbaZS9m1qTNEaG4c3Da4sfyj0ufzd5+wWpTzZfjZOf5hOkW QtrBiSWGPQJlRqREvLCRHtfuWVs+FkS993ZQrdS7iECAUYEjd0tqF6utBXMTGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669019495; 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=wsbZKRbJPUASMOvirbG14VMfLoF+hLkblrWtO9JiVTM=; b=VznbW4A7QZg15s4GIF6E1uhniZAeDg2JuoJs7pFYv7lQRozYvKFoFNQXvgfLvoJzbsJXpU l6h73kC80ZrkHNfWh81jqryll43bG0syOhIj5pPOWWA87rutq4zgezxi0qhTF/UmFm0pch JvM74wqdY9hNVSW5ZMwkUjdyJ29Zj7VRqkpUeV4G4qBMe0DpNJ4RLNdag3/ENyF0RLXPGY IbYA7vcMe2Hlgv5O1Knd+d6VjVequesYvWj/g+qqvAwBRJNREWYC0dN/zFnAaU44aep0j0 tUX9Si1QESebsknXe/UUcDM5EiFOWqnENzZ5Xx5RVlnJcK1uAwFM+Br5+mqBrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669019495; a=rsa-sha256; cv=none; b=HReFIU+H6oZgRfGcMpEkNCUEtY5rSi2ROdYqgWyQi77UX2TBNWtexIRCqZpHqcH5qQnDFX O4QGaNwHEClUB9elr7SJ8Qml/JckTZPCk295xJW8QRbkJNcf4FsOV+yQtqaShhWZvakldd 2etCzxJUzb3HN03NJMBQhJ4OsZdu00cAT4bSzd5YpaRdmfVQSKM5IXykbKWmYpxKgug3Ca C3rrVIQZHdJxlNf+AuQc5kg4X5PFFLqoaAdKsUlZa3pgWvSSGuCgAo/tUPQu//gZUI1Fg5 TU23z/yjMtgidnQfySWZ4E4KTXwqsAElHuiOyFlpPoaOxjZd+KiWZi7NA4AU2w== 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 4NG0wl3RlkzxCh; Mon, 21 Nov 2022 08:31:35 +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 2AL8VZ1I026387; Mon, 21 Nov 2022 08:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AL8VZCE026386; Mon, 21 Nov 2022 08:31:35 GMT (envelope-from git) Date: Mon, 21 Nov 2022 08:31:35 GMT Message-Id: <202211210831.2AL8VZCE026386@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: 8897b562abbf - main - bhyve: add helper to append a basl table without a header 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: 8897b562abbf1dbc2d6c83d31ed673d5220c3da3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=8897b562abbf1dbc2d6c83d31ed673d5220c3da3 commit 8897b562abbf1dbc2d6c83d31ed673d5220c3da3 Author: Corvin Köhne AuthorDate: 2022-11-16 08:31:29 +0000 Commit: Corvin Köhne CommitDate: 2022-11-21 08:27:51 +0000 bhyve: add helper to append a basl table without a header The common style for build an ACPI table will be: 1. basl_table_create 2. basl_table_append_header 3. setup an ACPI_TABLE_* struct 4. basl_table_append_bytes (without header) Add a helper for the last step. Reviewed by: jhb, markj Approved by: manu (mentor) MFC after: 2 weeks Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37406 --- usr.sbin/bhyve/basl.c | 11 +++++++++++ usr.sbin/bhyve/basl.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index e93d0e2e1a58..716393caeebe 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -437,6 +437,17 @@ basl_table_append_checksum(struct basl_table *const table, const uint32_t start, return (0); } +int +basl_table_append_content(struct basl_table *table, void *data, uint32_t len) +{ + assert(data != NULL); + assert(len >= sizeof(ACPI_TABLE_HEADER)); + + return (basl_table_append_bytes(table, + (void *)((uintptr_t)(data) + sizeof(ACPI_TABLE_HEADER)), + len - sizeof(ACPI_TABLE_HEADER))); +} + int basl_table_append_gas(struct basl_table *const table, const uint8_t space_id, const uint8_t bit_width, const uint8_t bit_offset, diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h index 3b61362d824f..0fe4ef7c5e82 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -53,6 +53,9 @@ int basl_table_append_bytes(struct basl_table *table, const void *bytes, uint32_t len); int basl_table_append_checksum(struct basl_table *table, uint32_t start, uint32_t len); +/* Add an ACPI_TABLE_* to basl without its header. */ +int basl_table_append_content(struct basl_table *table, void *data, + uint32_t len); int basl_table_append_gas(struct basl_table *table, uint8_t space_id, uint8_t bit_width, uint8_t bit_offset, uint8_t access_width, uint64_t address);