[libvirt] [PATCH 3/3] qemu: stop including real paths in nvram config option

Daniel P. Berrangé berrange at redhat.com
Thu Apr 18 13:39:42 UTC 2019


The qemu.conf docs list paths to firmware images, but these only reflect
the libvirt built-in default paths. Distros will typically override this
information at built time with --with-loader-nvram. Thus the paths in
the config are misleading to users. While we could subsistute in the
real built-in paths are build time, since we are switching to use the
firmware metadata files, this instead just uses dummy paths for
illustrating the syntax.

Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
 src/qemu/qemu.conf | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 334b4cd4ee..d157a5b058 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -750,13 +750,12 @@
 # Later, when libvirt creates per domain variable store, this list is
 # searched for the master image. The UEFI firmware can be called
 # differently for different guest architectures. For instance, it's OVMF
-# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default
-# follows this scheme.
+# for x86_64 and i686, but it's AAVMF for aarch64.
 #nvram = [
-#   "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
-#   "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd",
-#   "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd",
-#   "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
+#   "/some/path/to/OVMF_CODE.fd:/some/path/to/OVMF_VARS.fd",
+#   "/some/path/to/OVMF_CODE.secboot.fd:/some/path/to/OVMF_VARS.fd",
+#   "/some/path/to/AAVMF_CODE.fd:/some/path/to/AAVMF_VARS.fd",
+#   "/some/path/to/AAVMF32_CODE.fd:/some/path/to/AAVMF32_VARS.fd"
 #]
 
 # The backend to use for handling stdout/stderr output from
-- 
2.20.1




More information about the libvir-list mailing list