Boot using BIOS from /etc/firmware/vmm-bios by default.

Instead of using the internal "vmboot", VMs will now be booted using
the external BIOS firmware in /etc/firmware/vmm-bios (which is subject
to a LGPLv3 license).  Direct booting of OpenBSD kernels or
non-default BIOS images is still supported for now using the -b/boot
option that is replacing the -k/kernel option.

As requested by Theo, vmd(8) fails if neither the default BIOS is
found nor a kernel has been specified in the VM configuration.  The
"vmm" BIOS has to be installed using fw_update(1), which will be done
automatically in most cases where the OpenBSD can fetch it after
install/upgrade.

OK mlarkin@

1 files changed, 9 insertions, 10 deletions

diff --git a/usr.sbin/vmd/vm.conf.5 b/usr.sbin/vmd/vm.conf.5
index e58a4bd604a..6093c9d7cf4 100644
--- a/usr.sbin/vmd/vm.conf.5
+++ b/usr.sbin/vmd/vm.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vm.conf.5,v 1.16 2017/03/02 07:33:37 reyk Exp $
+.\" $OpenBSD: vm.conf.5,v 1.17 2017/03/25 16:28:25 reyk Exp $
 .\"
 .\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
 .\" Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 2 2017 $
+.Dd $Mdocdate: March 25 2017 $
 .Dt VM.CONF 5
 .Os
 .Sh NAME
@@ -82,7 +82,7 @@ For example:
 ramdisk="/bsd.rd"
 vm "vm1.example.com" {
 	memory 512M
-	kernel $ramdisk
+	boot $ramdisk
 }
 .Ed
 .Sh VM CONFIGURATION
@@ -97,6 +97,10 @@ This name can be any string, and is typically a hostname.
 .Pp
 Followed by a block of parameters that is enclosed in curly brackets:
 .Bl -tag -width Ds
+.It Cm boot Ar path
+Kernel or BIOS image to load when booting the VM.
+If not specified, the default is to boot using the BIOS image in
+.Pa /etc/firmware/vmm-bios .
 .It Cm enable
 Automatically start the VM.
 This is the default if neither
@@ -161,8 +165,6 @@ If the
 is greater than the number of
 .Ic interface
 statements, additional default interfaces will be added.
-.It Cm kernel Ar path
-Kernel to load when booting the VM.
 .It Cm memory Ar bytes
 Memory size of the VM, in bytes, rounded to megabytes.
 The default is 512M.
@@ -265,15 +267,12 @@ Stop the switch from forwarding packets.
 .Sh EXAMPLES
 Create a new VM with 1GB memory, 1 network interface connected to
 .Dq uplink ,
-one disk image
-.Sq disk.img
-and boot from kernel
-.Sq /bsd :
+and one disk image
+.Sq disk.img :
 .Bd -literal -offset indent
 vm "vm2.example.com" {
 	memory 1G
 	disk "/var/vmm/vm2-disk.img"
-	kernel "/bsd"
 	interface { switch "uplink" }
 }
 .Ed