tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg: QemuBootOrder: handle QEMU's "-boot strict=on" option 

When this option is passed to qemu, it appends the word HALT to the
"bootorder" fw_cfg file, as last entry. For example,

  /pci@i0cf8/ethernet@3/ethernet-phy@0
  /pci@i0cf8/scsi@4/disk@0,0
  HALT

The option's purpose is to prevent SeaBIOS from booting from devices that
have not been specified explicitly (with bootindex=N device properties nor
-boot options). When SeaBIOS sees HALT, it doesn't proceed to boot from
default locations (after boot fails from all of the listed locations).

The HALT string currently causes OVMF to reject the entire "bootorder"
fw_cfg contents, with "parse error". This is not good, because since a
recent libvirt commit, libvirt unconditionally passes "-boot strict=on" to
qemu. Consequently, the boot order logic in QemuBootOrder.c has stopped
working for libvirt users.

OVMF's SetBootOrderFromQemu() function actually implements the idea behind
"-boot strict=on": it drops all boot options not in the fw_cfg list. (*)
Therefore, let's recognize HALT, and just do what we've been doing all
along.

(*) Except the UEFI shell, according to the survival policy in
BootOrderComplete(), but the memory mapped UEFI shell is not expressible
via fw_cfg anyway, and its preservation has been requested on edk2-devel.
Hence it's a good boot option to keep in any case.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15197 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Laszlo Ersek 2014-01-29 21:44:23 +00:00 committed by jljusten
parent 869b17ccdc
commit c3cf8daa0f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c
View File

@ -849,8 +849,11 @@ TranslateOfwNodes (
the current implementation. Further calls the current implementation. Further calls
to this function are possible. to this function are possible.
@retval RETURN_NOT_FOUND Translation terminated, *Ptr was (and is) @retval RETURN_NOT_FOUND Translation terminated. On input, *Ptr was
pointing to an empty string. pointing to the empty string or "HALT". On
output, *Ptr points to the empty string
(ie. "HALT" is consumed transparently when
present).
@retval RETURN_INVALID_PARAMETER Parse error. This is a permanent error. @retval RETURN_INVALID_PARAMETER Parse error. This is a permanent error.
@ -870,7 +873,12 @@ TranslateOfwPath (
OFW_NODE Skip; OFW_NODE Skip;
NumNodes = 0; NumNodes = 0;
if (AsciiStrCmp (*Ptr, "HALT") == 0) {
*Ptr += 4;
Status = RETURN_NOT_FOUND;
} else {
Status = ParseOfwNode (Ptr, &Node[NumNodes], &IsFinal); Status = ParseOfwNode (Ptr, &Node[NumNodes], &IsFinal);
}
if (Status == RETURN_NOT_FOUND) { if (Status == RETURN_NOT_FOUND) {
DEBUG ((DEBUG_VERBOSE, "%a: no more nodes\n", __FUNCTION__)); DEBUG ((DEBUG_VERBOSE, "%a: no more nodes\n", __FUNCTION__));