14544 bhyve(1M) uses -A in EXAMPLES but doesn't otherwise document it

Reviewed by: Robert Mustacchi <rm+illumos@fingolfin.org>
Approved by: Rich Lowe <richlowe@richlowe.net>

3 files changed, 24 insertions, 11 deletions

diff --git a/usr/src/cmd/bhyve/bhyverun.c b/usr/src/cmd/bhyve/bhyverun.c
index bf2b784a01..8b622a304a 100644
--- a/usr/src/cmd/bhyve/bhyverun.c
+++ b/usr/src/cmd/bhyve/bhyverun.c
@@ -40,6 +40,7 @@
  * Copyright 2015 Pluribus Networks Inc.
  * Copyright 2018 Joyent, Inc.
  * Copyright 2021 Oxide Computer Company
+ * Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
  */
 
 #include <sys/cdefs.h>
@@ -236,18 +237,18 @@ usage(int code)
 #ifdef	__FreeBSD__
 		"Usage: %s [-AaCDeHhPSuWwxY]\n"
 #else
-		"Usage: %s [-AaCDdeHhPSuWwxY]\n"
+		"Usage: %s [-aCDdeHhPSuWwxY]\n"
 #endif
 		"       %*s [-c [[cpus=]numcpus][,sockets=n][,cores=n][,threads=n]]\n"
 #ifdef	__FreeBSD__
 		"       %*s [-G port] [-k config_file] [-l lpc] [-m mem] [-o var=value]\n"
 		"       %*s [-p vcpu:hostcpu] [-r file] [-s pci] [-U uuid] vmname\n"
 
+		"       -A: create ACPI tables\n"
 #else
 		"       %*s [-k <config_file>] [-l <lpc>] [-m mem] [-o <var>=<value>]\n"
 		"       %*s [-s <pci>] [-U uuid] vmname\n"
 #endif
-		"       -A: create ACPI tables\n"
 		"       -a: local apic is in xAPIC mode (deprecated)\n"
 		"       -C: include guest memory in core file\n"
 		"       -c: number of cpus and/or topology specification\n"
@@ -1429,7 +1430,17 @@ main(int argc, char *argv[])
 			set_config_bool("x86.x2apic", false);
 			break;
 		case 'A':
+#ifdef __FreeBSD__
+			/*
+			 * This option is ignored on illumos since the
+			 * generated ACPI tables are not used; the bootroms
+			 * have their own. The option is retained for backwards
+			 * compatibility but does nothing. Note that the
+			 * acpi_tables configuration is still accepted via
+			 * -o if somebody really wants to generate these tables.
+			 */
 			set_config_bool("acpi_tables", true);
+#endif
 			break;
 		case 'D':
 			set_config_bool("destroy_on_poweroff", true);
diff --git a/usr/src/man/man1m/bhyve.1m b/usr/src/man/man1m/bhyve.1m
index dfb4bc965b..689c34fdb3 100644
--- a/usr/src/man/man1m/bhyve.1m
+++ b/usr/src/man/man1m/bhyve.1m
@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" Portions Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+.\" Portions Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.Dd November 18, 2021
+.Dd February 26, 2022
 .Dt BHYVE 1M
 .Os
 .Sh NAME
@@ -772,7 +772,7 @@ block device backed by the
 filesystem image, and a serial port for the console:
 .Bd -literal -offset indent
 bhyve -c 2 -s 0,hostbridge -s 1,lpc -s 2,virtio-blk,/my/image \e
-  -l com1,stdio -A -H -P -m 1G vm1
+  -l com1,stdio -H -P -m 1G vm1
 .Ed
 .Pp
 Run a 24GB single-CPU virtual machine with three network ports.
@@ -780,7 +780,7 @@ Run a 24GB single-CPU virtual machine with three network ports.
 bhyve -s 0,hostbridge -s 1,lpc -s 2:0,virtio-net-viona,vmvnic0 \e
   -s 2:1,virtio-net-viona,vmvnic1 -s 2:2,virtio-net-viona,vmvnic2 \e
   -s 3,virtio-blk,/my/image -l com1,stdio \e
-  -A -H -P -m 24G bigvm
+  -H -P -m 24G bigvm
 .Ed
 .Pp
 Run an 8GB virtual machine with 2 quad core CPUs, 2 NVMe disks and one other
@@ -795,7 +795,7 @@ bhyve -c sockets=2,cores=4,threads=2 \e
   -s 2:0,ahci,cd:/images/install.iso \e
   -s 3,virtio-net-viona,vnic=vmvnic0 \e
   -l com1,socket,/tmp/vm.com1,wait \e
-  -A -H -P -m 8G
+  -H -P -m 8G
 .Ed
 .Pp
 Run a UEFI virtual machine with a display resolution of 800 by 600 pixels
@@ -806,7 +806,7 @@ bhyve -c 2 -m 4G -w -H \e
   -s 3,ahci-cd,/path/to/uefi-OS-install.iso \e
   -s 4,nvme,/dev/zvol/rdsk/tank/hdd0 \e
   -s 5,virtio-net-viona,vnic=vnmic0 \e
-  -s 29,fbuf,rfb=0.0.0.0:5900,w=800,h=600,wait \e
+  -s 29,fbuf,vga=off,rfb=0.0.0.0:5900,w=800,h=600,wait \e
   -s 30,xhci,tablet \e
   -s 31,lpc -l com1,stdio \e
   -l bootrom,/usr/share/bhyve/firmware/BHYVE_UEFI.fd \e
diff --git a/usr/src/man/man4/bhyve_config.4 b/usr/src/man/man4/bhyve_config.4
index 963139050c..94572b7ace 100644
--- a/usr/src/man/man4/bhyve_config.4
+++ b/usr/src/man/man4/bhyve_config.4
@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" Portions Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+.\" Portions Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.Dd September 25, 2021
+.Dd February 26, 2022
 .Dt BHYVE_CONFIG 4
 .Os
 .Sh NAME
@@ -123,7 +123,9 @@ If no suffix is given, the value is assumed to be in mebibytes.
 .It Va memory.wired Ta bool Ta false Ta
 Wire guest memory.
 .It Va acpi_tables Ta bool Ta false Ta
-Generate ACPI tables.
+Generate ACPI tables; these tables are
+.Em not
+used on illumos.
 .It Va destroy_on_poweroff Ta bool Ta false Ta
 Destroy the VM on guest-initiated power-off.
 .It Va gdb.address Ta string Ta localhost Ta