From 816ac135af4f007b1d20af89374ffcd733826010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cochard-Labb=C3=A9?= <olivier@freebsd.org>
Date: Sat, 2 Mar 2019 01:10:06 +0100
Subject: [PATCH] No more disks limitation with latest UEFI firmware

It seems we don't need to limit the number of disks since UEFI firmware version 0.2.
Tested with this setup: 2 ahci-hd, 2 nvme and 1 virtio-blk disks at the same time and no UEFI boot problem:
# kenv efi-version
2.40
# kenv smbios.system.product
BHYVE
# sysctl kern.disks
kern.disks: ada7 ada6 nda1 nda0 cd0 vtbd0
---
 lib/vm-run | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/vm-run b/lib/vm-run
index 93d84240..b69a263b 100644
--- a/lib/vm-run
+++ b/lib/vm-run
@@ -502,11 +502,6 @@ vm::bhyve_device_disks(){
             if [ -n "${_uefi}" ]; then
                 _slot=$((_slot + 1))
 
-                # stop at slot 6 on uefi
-                if [ ${_slot} -ge 7 ]; then
-                    util::log "guest" "${_name}" "ending disks at disk${_num} due to UEFI firmware limitations"
-                    break
-                fi
             else
                 _func=$((_func + 1))
             fi