D40990.id128251.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40990.id128251.diff
View Options

	diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
	--- a/usr.sbin/bhyve/acpi.c
	+++ b/usr.sbin/bhyve/acpi.c
	@@ -71,7 +71,6 @@
	static int basl_keep_temps;
	static int basl_verbose_iasl;
	static int basl_ncpu;
	-static uint32_t hpet_capabilities;

	/*
	* Contains the full pathname of the template to be passed
	@@ -218,6 +217,7 @@

	pci_write_dsdt();

	+#ifdef __amd64__
	dsdt_line("");
	dsdt_line(" Scope (_SB.PC00)");
	dsdt_line(" {");
	@@ -233,6 +233,7 @@
	dsdt_line(" })");
	dsdt_line(" }");
	dsdt_line(" }");
	+#endif

	vmgenc_write_dsdt();

	@@ -530,11 +531,18 @@
	return (0);
	}

	+#ifdef __amd64__
	static int
	build_hpet(struct vmctx *const ctx)
	{
	ACPI_TABLE_HPET hpet;
	struct basl_table *table;
	+ uint32_t hpet_capabilities;
	+ int err;
	+
	+ err = vm_get_hpet_capabilities(ctx, &hpet_capabilities);
	+ if (err != 0)
	+ return (err);

	BASL_EXEC(basl_table_create(&table, ctx, ACPI_SIG_HPET,
	BASL_TABLE_ALIGNMENT));
	@@ -551,6 +559,7 @@

	return (0);
	}
	+#endif

	static int
	build_madt(struct vmctx *const ctx)
	@@ -720,14 +729,8 @@
	int
	acpi_build(struct vmctx *ctx, int ncpu)
	{
	- int err;
	-
	basl_ncpu = ncpu;

	- err = vm_get_hpet_capabilities(ctx, &hpet_capabilities);
	- if (err != 0)
	- return (err);
	-
	/*
	* For debug, allow the user to have iasl compiler output sent
	* to stdout rather than /dev/null
	@@ -756,7 +759,9 @@
	BASL_EXEC(build_rsdp(ctx));
	BASL_EXEC(build_fadt(ctx));
	BASL_EXEC(build_madt(ctx));
	+#ifdef __amd64__
	BASL_EXEC(build_hpet(ctx));
	+#endif
	BASL_EXEC(build_mcfg(ctx));
	BASL_EXEC(build_facs(ctx));
	BASL_EXEC(build_spcr(ctx));