Changeset 89384 in vbox for trunk

Timestamp:

May 31, 2021 9:43:28 AM (4 years ago)

Author:

vboxsync

Message:

Devices/PC/BIOS: Allocate the bounce buffer only when booting from a CD drive to avoid stealing memory always, rename atapi_read to cdrom_read, bugref:4841

File:

• trunk/src/VBox/Devices/PC/BIOS/eltorito.c (modified) (9 diffs)

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

@@ -182 +182 @@
     // the only important data is this one for now
     cdemu->active = 0x00;
-    cdemu->ptr_unaligned = cdemu_bounce_buf_alloc() :> 0;
 }
 
@@ -295 +294 @@
 }
 
-static uint16_t atapi_read(uint8_t device, uint32_t lba, uint16_t nbsectors, void __far *buf)
+static uint16_t cdrom_read(uint8_t device, uint32_t lba, uint16_t nbsectors, void __far *buf)
 {
     uint16_t            ebda_seg=read_word(0x0040,0x000E);
@@ -332 +331 @@
         uint16_t xfer_sect = MIN(nbsectors, 4 - before);
 
-        error = atapi_read(device, ilba + slba, 1, cdemu->ptr_unaligned);
+        error = cdrom_read(device, ilba + slba, 1, cdemu->ptr_unaligned);
         if (error != 0)
             return error;
@@ -347 +346 @@
         uint16_t xfer_sect = nbsectors / 4;
 
-        error = atapi_read(device, ilba + slba, xfer_sect, dst);
+        error = cdrom_read(device, ilba + slba, xfer_sect, dst);
         if (error != 0)
             return error;
@@ -358 +357 @@
     if (nbsectors)
     {
-        error = atapi_read(device, ilba + slba, 1, cdemu->ptr_unaligned);
+        error = cdrom_read(device, ilba + slba, 1, cdemu->ptr_unaligned);
         if (error != 0)
             return error;
@@ -404 +403 @@
     for (read_try = 0; read_try <= 4; ++read_try)
     {
-        error = atapi_read(device, 0x11, 1, &buffer);
+        error = cdrom_read(device, 0x11, 1, &buffer);
         if (!error)
             break;
@@ -428 +427 @@
 
     /* Now we read the Boot Catalog. */
-    error = atapi_read(device, lba, 1, buffer);
+    error = cdrom_read(device, lba, 1, buffer);
     if (error != 0)
         return 7;
@@ -488 +487 @@
     if (error != 0)
         return 13;
+
+    cdemu->ptr_unaligned = cdemu_bounce_buf_alloc() :> 0;
+    if (cdemu->ptr_unaligned == NULL)
+        return 14;
 
     BX_DEBUG_ELTORITO("Emulate drive %02x, type %02x, LBA %lu\n",
@@ -893 +896 @@
                           __func__, count, lba, segment, offset);
 
-        status = atapi_read(device, lba, count, MK_FP(segment,offset));
+        status = cdrom_read(device, lba, count, MK_FP(segment,offset));
         count = (uint16_t)(bios_dsk->drqp.trsfbytes >> 11);
         i13x->count = count;