[src/netbsd-8]: src/sys/arch/i386/stand/efiboot Pull up following revision(s)...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a8875b33d32c
branches:  netbsd-8
changeset: 450550:a8875b33d32c
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Apr 17 15:55:00 2019 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #1231):

        sys/arch/i386/stand/efiboot/efidisk.c: revision 1.7

efiboot: Don't panic when BLOCK_IO_PROTOCOL is not found.

It has been reported that there is a machine where BLOCK_IO_PROTOCOL
can not be found when network boot without disk.

diffstat:

 sys/arch/i386/stand/efiboot/efidisk.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r 5687c2fe051d -r a8875b33d32c sys/arch/i386/stand/efiboot/efidisk.c
--- a/sys/arch/i386/stand/efiboot/efidisk.c     Tue Apr 16 03:48:02 2019 +0000
+++ b/sys/arch/i386/stand/efiboot/efidisk.c     Wed Apr 17 15:55:00 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efidisk.c,v 1.1.12.5 2018/04/11 14:51:43 martin Exp $  */
+/*     $NetBSD: efidisk.c,v 1.1.12.6 2019/04/17 15:55:00 martin Exp $  */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka <nonaka%netbsd.org@localhost>
@@ -57,8 +57,7 @@
        status = LibLocateHandle(ByProtocol, &BlockIoProtocol, NULL,
            &nhandles, &handles);
        if (EFI_ERROR(status))
-               panic("LocateHandle(BlockIoProtocol): %" PRIxMAX,
-                   (uintmax_t)status);
+               return;
 
        if (efi_bootdp != NULL)
                depth = efi_device_path_depth(efi_bootdp, MEDIA_DEVICE_PATH);
@@ -76,8 +75,7 @@
                status = uefi_call_wrapper(BS->HandleProtocol, 3, handles[i],
                    &BlockIoProtocol, (void **)&bio);
                if (EFI_ERROR(status))
-                       panic("HandleProtocol(BlockIoProtocol): %" PRIxMAX,
-                           (uintmax_t)status);
+                       continue;
 
                media = bio->Media;
                if (media->LogicalPartition || !media->MediaPresent)