[libvirt] [PATCH v2] qemu.conf: Make nvram list obsolete
Now that libvirt has firmware auto selection feature the nvram config knob is more or less obsolete. It still makes sense in cases where distro users are using does not provide FW descriptor files, therefore I'm not removing it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- diff to v1: - Use more verbose wording as suggested by Dan. src/qemu/qemu.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 334b4cd4ee..ace5e85e35 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -740,6 +740,14 @@ # Location of master nvram file # +# This configuration option is obsolete. Libvirt will follow the +# QEMU firmware metadata specification to automatically locate +# firmware images: +# +# https://git.qemu.org/gitweb.cgi?p=qemu.git;a=blob_plain;f=docs/interop/firmw... +# +# These metadata files are distributed alongside any firmware +# images intended for use with QEMU. # When a domain is configured to use UEFI instead of standard # BIOS it may use a separate storage for UEFI variables. If # that's the case libvirt creates the variable store per domain -- 2.21.0
On Thu, 2019-04-18 at 16:54 +0200, Michal Privoznik wrote: [...]
# Location of master nvram file # +# This configuration option is obsolete. Libvirt will follow the +# QEMU firmware metadata specification to automatically locate +# firmware images: +# +# https://git.qemu.org/gitweb.cgi?p=qemu.git;a=blob_plain;f=docs/interop/firmw...
Using 'a=blob_plain' results in my browser (Firefox) trying to parse the file and complaining loudly: SyntaxError: JSON.parse: unexpected character at line 1 column 1 of the JSON data Changing it to 'a=blob' gives me a nice page which, among other things, also contains a link to the raw version, so I would go with that one instead. Alternatively, you could just say See docs/interop/firmware.json in the QEMU source tree. and leave the URL out entirely: it's not like users, who are the target of the comment, will actually want to read the spec :)
+# +# These metadata files are distributed alongside any firmware +# images intended for use with QEMU.
Leave an empty line here. You could even do something like # images intended for use with QEMU. # # ------------------------------------------ # # When a domain is configured to use UEFI instead of standard to make it extremely obvious the part after the cut is documentation for the now obsolete configuration option. -- Andrea Bolognani / Red Hat / Virtualization
On 4/30/19 1:34 PM, Andrea Bolognani wrote:
On Thu, 2019-04-18 at 16:54 +0200, Michal Privoznik wrote: [...]
# Location of master nvram file # +# This configuration option is obsolete. Libvirt will follow the +# QEMU firmware metadata specification to automatically locate +# firmware images: +# +# https://git.qemu.org/gitweb.cgi?p=qemu.git;a=blob_plain;f=docs/interop/firmw...
Using 'a=blob_plain' results in my browser (Firefox) trying to parse the file and complaining loudly:
SyntaxError: JSON.parse: unexpected character at line 1 column 1 of the JSON data
Changing it to 'a=blob' gives me a nice page which, among other things, also contains a link to the raw version, so I would go with that one instead.
Alternatively, you could just say
See docs/interop/firmware.json in the QEMU source tree.
and leave the URL out entirely: it's not like users, who are the target of the comment, will actually want to read the spec :)
+# +# These metadata files are distributed alongside any firmware +# images intended for use with QEMU.
Leave an empty line here. You could even do something like
# images intended for use with QEMU. # # ------------------------------------------ # # When a domain is configured to use UEFI instead of standard
to make it extremely obvious the part after the cut is documentation for the now obsolete configuration option.
Okay, I'll post v3. Hopefully everybody and every browser will be happy with it. Michal
participants (2)
-
Andrea Bolognani -
Michal Privoznik