diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2016-09-07 12:47:19 +0200 |
|---|---|---|
| committer | Laszlo Ersek <lersek@redhat.com> | 2016-09-08 10:04:09 +0200 |
| commit | d796d33f1844deb492bc571c7f2e2b6780b92368 (patch) | |
| tree | cf58825e8ac2757c54ab120c12d4bd87a8d6db43 /OvmfPkg/Library/QemuBootOrderLib | |
| parent | 4ac14ceae076439dcea926bc47cda4e1d2779cae (diff) | |
| download | edk2-d796d33f1844deb492bc571c7f2e2b6780b92368.tar.gz edk2-d796d33f1844deb492bc571c7f2e2b6780b92368.tar.bz2 edk2-d796d33f1844deb492bc571c7f2e2b6780b92368.zip | |
OvmfPkg/QemuBootOrderLib: drop too strict "/HD(" suffix from vblk prefix
Translating QEMU's virtio-block OpenFirmware device path to a UEFI device
path prefix was one of the earliest case handled in QemuBootOrderLib. At
that time, I terminated the translation output (the UEFI devpath prefix)
with a "/HD(" suffix.
The intent was for the translation to prefix-match only boot options with
HD() device path nodes in them, that is, no auto-generated "device level"
boot options. This was motivated by prioritizing specific boot options
created by OS installers over auto-generated "device level" options.
However, practice has shown that:
- OS installers place their installed boot options first in the boot order
anyway,
- other device types (SATA disks, virtio-scsi disks), where "/HD(" is not
appended, work just fine,
- requiring "/HD(" actually causes problems: after the OS-installed
specific boot option has been lost (or purposely removed), the
auto-generated "device level" boot option does the right thing (see the
Default Boot Behavior under
<http://blog.uncooperative.org/blog/2014/02/06/the-efi-system-partition/>).
The "/HD(" requirement causes such boot options to be dropped, which
prevents "fallback.efi" from running.
Relax the matching by removing the "/HD(" suffix from the translated
prefix.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Fixes: e06a4cd134064590aa1a855ff4b973023279e805
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1373812
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Diffstat (limited to 'OvmfPkg/Library/QemuBootOrderLib')
| -rw-r--r-- | OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c index 86082301a8..8cbbdb0568 100644 --- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c +++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c @@ -872,13 +872,13 @@ TranslatePciOfwNodes ( //
// UEFI device path prefix:
//
- // PciRoot(0x0)/Pci(0x6,0x0)/HD( -- if PCI function is 0 or absent
- // PciRoot(0x0)/Pci(0x6,0x3)/HD( -- if PCI function is present and nonzero
+ // PciRoot(0x0)/Pci(0x6,0x0) -- if PCI function is 0 or absent
+ // PciRoot(0x0)/Pci(0x6,0x3) -- if PCI function is present and nonzero
//
Written = UnicodeSPrintAsciiFormat (
Translated,
*TranslatedSize * sizeof (*Translated), // BufferSize in bytes
- "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)/HD(",
+ "PciRoot(0x%x)%s/Pci(0x%Lx,0x%Lx)",
PciRoot,
Bridges,
PciDevFun[0],
@@ -1117,12 +1117,12 @@ TranslateMmioOfwNodes ( //
// UEFI device path prefix:
//
- // <VenHwString>/HD(
+ // <VenHwString>
//
Written = UnicodeSPrintAsciiFormat (
Translated,
*TranslatedSize * sizeof (*Translated), // BufferSize in bytes
- "%s/HD(",
+ "%s",
VenHwString
);
} else if (NumNodes >= 3 &&
|