MdeModulePkg/BmBoot: Skip removable media if it is not present

Only enumerate devices that have media present.

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 962892d38f1479298ce19c19e904eb2cdf8e0ff3..bde22fa6590ead0818d0a416d5b868916425bfd1 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2218,6 +2218,15 @@ BmEnumerateBootOptions (
         continue;\r
       }\r
 \r
+      //\r
+      // Skip removable media if not present\r
+      //\r
+      if ((BlkIo->Media->RemovableMedia == TRUE) &&\r
+          (BlkIo->Media->MediaPresent == FALSE))\r
+      {\r
+        continue;\r
+      }\r
+\r
       Description = BmGetBootDescription (Handles[Index]);\r
       BootOptions = ReallocatePool (\r
                       sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * (*BootOptionCount),\r