Changeset 55188 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 10, 2015 4:08:36 PM (10 years ago)

Author:

vboxsync

Message:

BIOS: Better error checking in SCSI driver.

File:

• trunk/src/VBox/Devices/PC/BIOS/scsi.c (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/scsi.c

@@ -109 +109 @@
     while (status & VBSCSI_BUSY);
 
+    /* If any error occurred, inform the caller and don't bother reading the data. */
+    if (status & VBSCSI_ERROR) {
+        outb(io_base + VBSCSI_REGISTER_RESET, 0);
+
+        status = inb(io_base + VBSCSI_REGISTER_DEVSTAT);
+        DBG_SCSI("%s: read failed, device status %02X\n", __func__, status);
+        return 4;   /* Sector not found */
+    }
+
     /* Read in the data. The transfer length may be exactly 64K or more,
      * which needs a bit of care when we're using 16-bit 'rep ins'.
@@ -163 +172 @@
         status = inb(io_base + VBSCSI_REGISTER_STATUS);
     while (status & VBSCSI_BUSY);
+
+    /* If any error occurred, inform the caller. */
+    if (status & VBSCSI_ERROR) {
+        outb(io_base + VBSCSI_REGISTER_RESET, 0);
+
+        status = inb(io_base + VBSCSI_REGISTER_DEVSTAT);
+        DBG_SCSI("%s: write failed, device status %02X\n", __func__, status);
+        return 4;   /* Sector not found */
+    }
 
     return 0;