From d848396f15d8611b777b2fbccea7ae75f4e47b76 Mon Sep 17 00:00:00 2001
From: Richard Laager <rlaager@wiktel.com>
Date: Mon, 20 Jun 2016 15:01:29 -0500
Subject: [PATCH] Add KVM UEFI instructions

These came from Eric Villard <dev@eviweb.fr>.

Closes #4764
---
 Ubuntu-16.04-Root-on-ZFS.md | 12 ++++++++++--
 Ubuntu-16.10-Root-on-ZFS.md | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Ubuntu-16.04-Root-on-ZFS.md b/Ubuntu-16.04-Root-on-ZFS.md
index d1101fc..1005206 100644
--- a/Ubuntu-16.04-Root-on-ZFS.md
+++ b/Ubuntu-16.04-Root-on-ZFS.md
@@ -428,6 +428,14 @@ Upgrade or downgrade the Areca driver if something like `RIP: 0010:[<ffffffff810
 
 ### QEMU/KVM/XEN
 
-* In the `/etc/default/grub` file,  enable the `GRUB_TERMINAL=console` line and remove the `splash` option from the `GRUB_CMDLINE_LINUX_DEFAULT` line.  Plymouth can cause boot errors in these virtual environments that are difficult to diagnose.
+In the `/etc/default/grub` file,  enable the `GRUB_TERMINAL=console` line and remove the `splash` option from the `GRUB_CMDLINE_LINUX_DEFAULT` line.  Plymouth can cause boot errors in these virtual environments that are difficult to diagnose.
 
-* Set a unique serial number on each virtual disk (e.g.: `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
+Set a unique serial number on each virtual disk (e.g.: `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
+
+To be able to use UEFI in guests (instead of only BIOS booting):
+
+    $ sudo apt-get install ovmf
+    $ sudo vi /etc/libvirt/qemu.conf
+    Uncomment this line:
+    nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ]
+    $ sudo service libvirt-bin restart
diff --git a/Ubuntu-16.10-Root-on-ZFS.md b/Ubuntu-16.10-Root-on-ZFS.md
index 88758f9..67ac923 100644
--- a/Ubuntu-16.10-Root-on-ZFS.md
+++ b/Ubuntu-16.10-Root-on-ZFS.md
@@ -430,6 +430,14 @@ Upgrade or downgrade the Areca driver if something like `RIP: 0010:[<ffffffff810
 
 ### QEMU/KVM/XEN
 
-* In the `/etc/default/grub` file,  enable the `GRUB_TERMINAL=console` line and remove the `splash` option from the `GRUB_CMDLINE_LINUX_DEFAULT` line.  Plymouth can cause boot errors in these virtual environments that are difficult to diagnose.
+In the `/etc/default/grub` file,  enable the `GRUB_TERMINAL=console` line and remove the `splash` option from the `GRUB_CMDLINE_LINUX_DEFAULT` line.  Plymouth can cause boot errors in these virtual environments that are difficult to diagnose.
 
-* Set a unique serial number on each virtual disk (e.g.: `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
+Set a unique serial number on each virtual disk (e.g.: `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
+
+To be able to use UEFI in guests (instead of only BIOS booting):
+
+    $ sudo apt-get install ovmf
+    $ sudo vi /etc/libvirt/qemu.conf
+    Uncomment this line:
+    nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ]
+    $ sudo service libvirt-bin restart