Changeset 8631 in vbox for trunk

Timestamp:

May 6, 2008 4:32:39 PM (17 years ago)

Author:

vboxsync

Message:

Make sure cd booting doesn't get upset by the media change guest notification hack in DevATA, which signals the need for attention.

File:

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

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

@@ -3581 +3581 @@
   Bit16u boot_segment, nbsectors, i, error;
   Bit8u  device;
+#ifdef VBOX
+  Bit8u  read_try;
+#endif /* VBOX */
 
   // Find out the first cdrom
@@ -3599 +3602 @@
   atacmd[4]=(0x11 & 0x0000ff00) >> 8;
   atacmd[5]=(0x11 & 0x000000ff);
+#ifdef VBOX
+  for (read_try = 0; read_try <= 4; read_try++)
+  {
+    error = ata_cmd_packet(device, 12, get_SS(), atacmd, 0, 2048L, ATA_DATA_IN, get_SS(), buffer);
+    if (!error)
+      break;
+  }
+  if (error)
+    return 3;
+#else /* !VBOX */
   if((error = ata_cmd_packet(device, 12, get_SS(), atacmd, 0, 2048L, ATA_DATA_IN, get_SS(), buffer)) != 0)
     return 3;
+#endif /* !VBOX */
 
   // Validity checks