D39549.id120457.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39549.id120457.diff
View Options

	diff --git a/usr.sbin/bhyve/e820.h b/usr.sbin/bhyve/e820.h
	--- a/usr.sbin/bhyve/e820.h
	+++ b/usr.sbin/bhyve/e820.h
	@@ -40,5 +40,6 @@
	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);
	diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c
	--- a/usr.sbin/bhyve/e820.c
	+++ b/usr.sbin/bhyve/e820.c
	@@ -70,6 +70,41 @@
	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)
	{