14763 bhyve upstream sync 2022 August

Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>

2 files changed, 114 insertions, 13 deletions

diff --git a/usr/src/man/man5/bhyve_config.5 b/usr/src/man/man5/bhyve_config.5
index f031165f89..3a5c0a2615 100644
--- a/usr/src/man/man5/bhyve_config.5
+++ b/usr/src/man/man5/bhyve_config.5
@@ -25,7 +25,7 @@
 .\"
 .\" Portions Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.Dd April 6, 2022
+.Dd June 1, 2022
 .Dt BHYVE_CONFIG 5
 .Os
 .Sh NAME
@@ -174,6 +174,96 @@ Enable debug messages relating to the emulated XHCI
 controller.
 These messages are sent to
 .Dv stderr .
+.It Va bios.vendor Ta string Ta BHYVE Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va bios.version Ta string Ta 14.0 Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va bios.release_date Ta string Ta 10/17/2021 Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.family_name Ta string Ta Virtual Machine Ta
+Family the computer belongs to.
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.manufacturer Ta string Ta illumos Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.product_name Ta string Ta BHYVE Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.serial_number Ta string Ta None Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.sku Ta string Ta None Ta
+Stock keeping unit of the computer.
+It's also called product ID or purchase order number.
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va system.version Ta string Ta 1.0 Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.manufacturer Ta string Ta illumos Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.product_name Ta string Ta BHYVE Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.version Ta string Ta 1.0 Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.serial_number Ta string Ta None Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.asset_tag Ta string Ta None Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va board.location Ta string Ta None Ta
+Describes the board's location within the chassis.
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va chassis.manufacturer Ta string Ta illumos Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va chassis.version Ta string Ta 1.0 Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va chassis.serial_number Ta string Ta None Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va chassis.asset_tag Ta string Ta None Ta
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va chassis.sku Ta string Ta None Ta
+Stock keeping unit of the chassis.
+It's also called product ID or purchase order number.
+This value is used for the guest's System Management BIOS System Information
+structure.
+.It Va smbios.family Ta string Ta Virtual Machine Ta
+Legacy alias for
+.Va system.family_name ,
+do not use in new configurations.
+.It Va smbios.manufacturer Ta string Ta illumos Ta
+Legacy alias for
+.Va system.manufacturer ,
+do not use in new configurations.
+.It Va smbios.product Ta string Ta BHYVE Ta
+Legacy alias for
+.Va system.product_name ,
+do not use in new configurations.
+.It Va smbios.serial Ta string Ta None Ta
+Legacy alias for
+.Va system.serial_number ,
+do not use in new configurations.
+.It Va smbios.sku Ta string Ta None Ta
+Legacy alias for
+.Va system.sku ,
+do not use in new configurations.
+.It Va smbios.version Ta string Ta 1.0 Ta
+Legacy alias for
+.Va system.version ,
+do not use in new configurations.
 .El
 .Ss x86-Specific Settings
 .Bl -column "x86.vmexit_on_pause" "integer" "Default"
diff --git a/usr/src/man/man8/bhyve.8 b/usr/src/man/man8/bhyve.8
index a862668b8c..cb5551a33b 100644
--- a/usr/src/man/man8/bhyve.8
+++ b/usr/src/man/man8/bhyve.8
@@ -24,7 +24,7 @@
 .\"
 .\" Portions Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 .\"
-.Dd February 26, 2022
+.Dd June 1, 2022
 .Dt BHYVE 8
 .Os
 .Sh NAME
@@ -115,17 +115,28 @@ It will be deprecated in a future version.
 .Xc
 Configure smbios data.
 .Ar type
-must be set to
-.Sy 1 .
-Supported keys are:
-.Sy manufacturer ,
-.Sy product ,
-.Sy version ,
-.Sy serial ,
-.Sy sku ,
-.Sy family
-and
-.Sy uuid .
+must be set to one of
+.Cm 0 , 1 , 2
+or
+.Cm 3 .
+Supported keys for each type are:
+.Bl -tag -width XXX -offset XXX
+.It Cm 0
+.Cm vendor , version , release_date .
+.It Cm 1
+.Cm manufacturer ,
+.Cm product_name Pq or Cm product ,
+.Cm version ,
+.Cm serial_number Pq or Cm serial ,
+.Cm sku ,
+.Cm family_name Pq or Cm family ,
+.Cm uuid .
+.It Cm 2
+.Cm manufacturer , product_name , version , serial_number , asset_tag ,
+.Cm location
+.It Ic 3
+.Cm manufacturer , version , serial_number , asset_tag, sku .
+.El
 .It Xo Fl c
 .Sm off
 .Op Oo Cm cpus= Oc Ar numcpus