From nobody Mon May 08 08:25:31 2023 X-Original-To: dev-commits-src-branches@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 4QFDrC4j7Tz49ZBd; Mon, 8 May 2023 08:25:31 +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 4QFDrC3wrYz3lLK; Mon, 8 May 2023 08:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534331; 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=4msUovhD98NHfWL5Acmtpi95PrsMgtdhD2SOpATx/ec=; b=GmBu2MxmDVzNl70dOr2cQYpu/x3pHC8qPLKkP8S5Ux4SffLTuFX/ONgfpUHXYjFGzLfB/x jeHepyWGVllXSzbKM53YELdGrfhKgCPV1ZmHXNxdBIOT3aZao40xdmT5GI6ENhf8e7wntZ jrqYT5WJUEHPQCrXxLhT1jFdQE52K6Gd6iyupq35xbpj9aePKhh7iE1KPGXGXmEKEf1QnV hJswQFlRelAKViwXJ7+EiTuzHvzCB2LJnaL4UTLI4NuiAfNLIdLJ7BBakzFq+heQMna80r 55IwJpqHzTywVeIGt4uzMo+r6ED9yEO1XOnF3FMpyI2yxr+rKU1RnwlCcNU5XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683534331; 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=4msUovhD98NHfWL5Acmtpi95PrsMgtdhD2SOpATx/ec=; b=mQcjO0PHfasg0c96gsmpCmIXrdVCicYBK9rGhUI+km6yF4JWc3P1HCFpr3q2dKQ/ZQ0LBV I1zykUUkZlIzyhNQQr3ylE2PC9A90MQ/Z0SsrUIpzN9qEiKK5G8eT8KBac7gz9wlLICRfM sXIsNkR6erTRRYrw8zSNjixYxKogdel305eMJFh+tE37ba83SkSa9io90g+A0uRMFfbU+K 74ubjLmYCQMdsicT6lCG9Cts1mkHKGWNuoDp82R0Z6jqHepI8f0IfCDxR7k2nWsY8y+2Pi Bkm8aZY17oFMpwVfesXKhRL8zLKdI588io+rcTP3CRHfKfEXyTvI//7j2NE5xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683534331; a=rsa-sha256; cv=none; b=lZ+J3beqgZV9IMnJqjZcG/XWUjkuRdgmhxknF1BMs8uWRYEd6j0n30bqGizQUMteajDyz7 DZa6PaWaGMhlR7XY0W6qiaxwCAtzqPCnl5XiizkNR5M55/9EnAydZxKGdlSZheblqkP8Ug JLYEUwNHUR6XvZiGal8VsqqEF7nlyVHP44iMHgE4XmVxDQrp8mzMUR1e65F20ReqyV9nrS eWmwUQd3vH9NSxGRl1PtBLyhp6h89ikaKDSudQ5txD0VIS6TNjuSHQQtnkjhE5B4fRCmZJ i2xdK5QvYED/5Vy6P5HaKllrd01kHRDhHMUlEXcJSvSFEnxhiZKT9YJmY2tYeA== 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 4QFDrC2n01ztLc; Mon, 8 May 2023 08:25:31 +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 3488PVw1050435; Mon, 8 May 2023 08:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3488PVxt050434; Mon, 8 May 2023 08:25:31 GMT (envelope-from git) Date: Mon, 8 May 2023 08:25:31 GMT Message-Id: <202305080825.3488PVxt050434@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: f1b5ce0d1d75 - stable/13 - bhyve: add E820 dump function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f1b5ce0d1d75a46dfad65a6f2079376d506e9913 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b5ce0d1d75a46dfad65a6f2079376d506e9913 commit f1b5ce0d1d75a46dfad65a6f2079376d506e9913 Author: Corvin Köhne AuthorDate: 2021-09-09 09:37:03 +0000 Commit: Corvin Köhne CommitDate: 2023-05-08 08:21:32 +0000 bhyve: add E820 dump function For debugging purposes it is helpful to dump the E820 table. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39549 (cherry picked from commit a8a8e9af574c63fbecf4719e3bf184795dc98c51) --- usr.sbin/bhyve/e820.c | 35 +++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/e820.h | 1 + 2 files changed, 36 insertions(+) diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c index 922381d032ce..6c43e6eda3a5 100644 --- a/usr.sbin/bhyve/e820.c +++ b/usr.sbin/bhyve/e820.c @@ -70,6 +70,41 @@ e820_element_alloc(uint64_t base, uint64_t end, enum e820_memory_type type) return (element); } +static const char * +e820_get_type_name(const enum e820_memory_type type) +{ + switch (type) { + case E820_TYPE_MEMORY: + return ("RAM"); + case E820_TYPE_RESERVED: + return ("Reserved"); + case E820_TYPE_ACPI: + return ("ACPI"); + case E820_TYPE_NVS: + return ("NVS"); + default: + return ("Unknown"); + } +} + +void +e820_dump_table(void) +{ + struct e820_element *element; + uint64_t i; + + fprintf(stderr, "E820 map:\n"); + + i = 0; + TAILQ_FOREACH(element, &e820_table, chain) { + fprintf(stderr, " (%4lu) [%16lx, %16lx] %s\n", i, + element->base, element->end, + e820_get_type_name(element->type)); + + ++i; + } +} + struct qemu_fwcfg_item * e820_get_fwcfg_item(void) { diff --git a/usr.sbin/bhyve/e820.h b/usr.sbin/bhyve/e820.h index 8b8e23422e1f..8703a55115cd 100644 --- a/usr.sbin/bhyve/e820.h +++ b/usr.sbin/bhyve/e820.h @@ -40,5 +40,6 @@ struct e820_entry { uint64_t e820_alloc(const uint64_t address, const uint64_t length, const uint64_t alignment, const enum e820_memory_type type, const enum e820_allocation_strategy strategy); +void e820_dump_table(void); struct qemu_fwcfg_item *e820_get_fwcfg_item(void); int e820_init(struct vmctx *const ctx);