From nobody Mon Dec 5 07:41:59 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 4NQb9370SGz4jfJC; Mon, 5 Dec 2022 07:41:59 +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 4NQb9363D5z4Fsg; Mon, 5 Dec 2022 07:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226119; 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=SIWtj9qYF/7Ojt7YSr2qW+zOukqnJ1Kt5Ca9RD4R9ZA=; b=o107cagO+DOQ30Y854OOJF4qnD/GsUPHqJGZo3IItYioKKUSdzCDZ8T7XgWuw4c+6ecV9e wUt4m5CppXPkkBJXT+AGv6RAm5Icr6SLsyi3YxMjIJY/YEur4b0YQ+jsFY86CeUqryyjLQ zVuyQ8noHNb25k+ycniV7CEll2I1+vZMHdF+WGch+twGiX/OlOQ9xuqe19kDphiJvRpU4y Qgdlk5254XJ1M2PcEOrqbIfXR0nqXwDxha23aR0kRUChe1VnHk7wN/XvC93Q9yFkWzfrSk j+e9JPy1M86Gpe/B8wKm0JvBbeJva0EDgvAaV4ECv9RSo3zqlJovlyNGpO/PrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670226119; 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=SIWtj9qYF/7Ojt7YSr2qW+zOukqnJ1Kt5Ca9RD4R9ZA=; b=ExuOzB+GYEucAgthwBZbIw9n12x/Hn2acLqFE93etn4oRFOqB3+xRvOTPBwQkLu8U/FODF 30o6qR91C4/1/6V670yFrdfiG7zxnvkImbNwjuK8VBb8ED3Z4xlE8je0pmSPvYo4Gs58DR LrQ754xBhdXK94CX8aZ9jQulEWOIUPux+SpW5rLM5QPrz2X9ZpT56aOAn3D8JiVXv6p3O+ spoGCe1knM4RAl37nWZgPJsCnK9qyjK4+J9iZz8A266sZQOuWlGEiBXg6+ypPZqRbycz4z FWHSaB/yOKk+aPor4fcxNSYnJ0askL7ufo9W3O77QJ7Ajo5Eo8BtfQHAjLRunw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670226119; a=rsa-sha256; cv=none; b=oBbDvc7yhSg2IeAUj8GzLsirl50MNucTqZuguZ+/ezxmwhya4k6yMwdumXnlAIW2bzVJa/ aZWPTbwX2CmF9ZeXeAaSQw2LW+4DnPAZhv3BzV627hg3JhAjbuFLPmLeOpHQzUREmK0qPy ZcOLIaFjlV4ThZZueHG1lklExKVARroU8pB80r0hyHyUvCIhAG/UeEeyWllF6NrusMfGGp FSufCAlK3+hAAA3auDyg04RCrxqxQ8Yzyi3OYKGggcemH4czw9Ry2hJ/ZWKc+5gnsSiVVx ZiL0VZN77DoKHR/RtgApsNpzKbWtWDTGjrs131o/SYffiG4oYeTkV7LBL5iVfw== 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 4NQb9354B0zq21; Mon, 5 Dec 2022 07:41:59 +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 2B57fxll082821; Mon, 5 Dec 2022 07:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B57fxDr082820; Mon, 5 Dec 2022 07:41:59 GMT (envelope-from git) Date: Mon, 5 Dec 2022 07:41:59 GMT Message-Id: <202212050741.2B57fxDr082820@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: c8029c30a872 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: c8029c30a8729b8af133352df92d1c4a0d41353e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c8029c30a8729b8af133352df92d1c4a0d41353e commit c8029c30a8729b8af133352df92d1c4a0d41353e Author: Corvin Köhne AuthorDate: 2022-11-16 08:31:29 +0000 Commit: Corvin Köhne CommitDate: 2022-12-05 07:39:34 +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 (cherry picked from commit 8897b562abbf1dbc2d6c83d31ed673d5220c3da3) --- 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 7accc7088a9d..9af1baed7dd7 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -438,6 +438,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 5c6c5123d887..b634164c42de 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -50,6 +50,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);