D41778.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41778.diff
View Options

	diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8
	--- a/usr.sbin/bhyve/bhyve.8
	+++ b/usr.sbin/bhyve/bhyve.8
	@@ -112,9 +112,7 @@
	.Bl -tag -width 10n
	.It Fl A
	Generate ACPI tables.
	-Required for
	-.Fx Ns /amd64
	-guests.
	+bhyve always generates ACPI tables so this option is obsolete.
	.It Fl a
	The guest's local APIC is configured in xAPIC mode.
	The xAPIC mode is the default setting so this option is redundant.
	diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5
	--- a/usr.sbin/bhyve/bhyve_config.5
	+++ b/usr.sbin/bhyve/bhyve_config.5
	@@ -120,7 +120,7 @@
	.Xr expand_number 3 .
	.It Va memory.wired Ta bool Ta false Ta
	Wire guest memory.
	-.It Va acpi_tables Ta bool Ta false Ta
	+.It Va acpi_tables Ta bool Ta true Ta
	Generate ACPI tables.
	.It Va acpi_tables_in_memory Ta bool Ta true Ta
	.Xr bhyve 8
	diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
	--- a/usr.sbin/bhyve/bhyverun.c
	+++ b/usr.sbin/bhyve/bhyverun.c
	@@ -1201,7 +1201,7 @@
	set_defaults(void)
	{

	- set_config_bool("acpi_tables", false);
	+ set_config_bool("acpi_tables", true);
	set_config_bool("acpi_tables_in_memory", true);
	set_config_value("memory.size", "256M");
	set_config_bool("x86.strictmsr", true);
	@@ -1240,7 +1240,11 @@
	set_config_bool("x86.x2apic", false);
	break;
	case 'A':
	- set_config_bool("acpi_tables", true);
	+ /*
	+ * NOP. For backward compatibility. Most systems don't
	+ * work properly without sane ACPI tables. Therefore,
	+ * we're always generating them.
	+ */
	break;
	case 'D':
	set_config_bool("destroy_on_poweroff", true);