:: commit dceb954807c97990f3c6fbfb6a510d2a21e58795
Fix netboot in configs where BLOCK_IO does not exist
For example, netbooting qemu-system-aarch64 with no drive specified will result in OVMF not loading the BLOCK_IO_PROTOCOL, causing a panic in disk.s2.c.
diff --git a/common/drivers/disk.s2.c b/common/drivers/disk.s2.c
index d9e0a519..465402fe 100644
--- a/common/drivers/disk.s2.c
+++ b/common/drivers/disk.s2.c
@@ -545,11 +545,19 @@ void disk_create_index(void) {
EFI_GUID block_io_guid = BLOCK_IO_PROTOCOL;
EFI_HANDLE *handles = tmp_handles;
- UINTN handles_size = sizeof(EFI_HANDLE);
+ UINTN handles_size = sizeof(tmp_handles);
status = gBS->LocateHandle(ByProtocol, &block_io_guid, NULL, &handles_size, handles);
+ // we only care about the first handle, so ignore if we get EFI_BUFFER_TOO_SMALL
if (status != EFI_BUFFER_TOO_SMALL && status != EFI_SUCCESS) {
+ EFI_GUID pxe_guid = EFI_PXE_BASE_CODE_PROTOCOL_GUID;
+ status = gBS->LocateHandle(ByProtocol, &pxe_guid, NULL, &handles_size, handles);
+ // likewise, all that matters is that the protocol is present
+ if (status == EFI_BUFFER_TOO_SMALL || status == EFI_SUCCESS) {
+ return;
+ }
+
goto fail;
}
