i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

haiku_loader now ignores unusable drives reported by BIOS.

Browse Source 
This fixes the problem with find_unique_check_sums() taking a very long
time to complete when one or more drives report read errors.

Fixes #10880.

[Paweł: minor style issue]
Signed-off-by: Paweł Dziepak <[email protected]>
This commit is contained in:
Michał Siejak
2014-05-29 22:32:15 +02:00
committed by Paweł Dziepak
parent 44ec21c3ff
commit 679ad262e9
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/bios_ia32/devices.cpp
+18 -1
View File
@@ -409,6 +409,16 @@ compute_check_sum(BIOSDrive *drive, off_t offset)
return sum;
}
/** Checks if the specified drive is usable for reading.
*/
static bool
is_drive_readable(BIOSDrive *drive)
{
char buffer;
return drive->ReadAt(NULL, 0, &buffer, sizeof(buffer)) > 0;
}
static void
find_unique_check_sums(NodeList *devices)
@@ -532,7 +542,14 @@ add_block_devices(NodeList *devicesList, bool identifierMissing)
continue;
}
devicesList->Add(drive);
// Only add usable drives
if (is_drive_readable(drive))
devicesList->Add(drive);
else {
dprintf("could not read from drive %" B_PRIu8 ", not adding\n", driveID);
delete drive;
continue;
}
if (drive->FillIdentifier() != B_OK)
identifierMissing = true;