Changeset 34169 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Nov 18, 2010 1:09:35 PM (14 years ago)

Author:

vboxsync

Message:

DevPcBios.cpp: remove no longer needed alignment for net boot images read from a file, and derive the size limit from the start address. Still 56K max.

File:

• trunk/src/VBox/Devices/PC/DevPcBios.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -1282 +1282 @@
     }
 
-    uint64_t cbFileLanBoot, cbFileLanBootAlign;
+    uint64_t cbFileLanBoot;
     const uint8_t *pu8LanBootBinary = NULL;
     uint64_t cbLanBootBinary;
@@ -1299 +1299 @@
             if (RT_SUCCESS(rc))
             {
-                cbFileLanBootAlign = RT_ALIGN(cbFileLanBoot, _4K);
-                if (cbFileLanBootAlign > _64K - (VBOX_LANBOOT_SEG << 4 & 0xffff))
+                if (cbFileLanBoot > _64K - (VBOX_LANBOOT_SEG << 4 & 0xffff))
                     rc = VERR_TOO_MUCH_DATA;
             }
@@ -1325 +1324 @@
          * Allocate buffer for the LAN boot ROM data.
          */
-        pThis->pu8LanBoot = (uint8_t *)PDMDevHlpMMHeapAllocZ(pDevIns, cbFileLanBootAlign);
+        pThis->pu8LanBoot = (uint8_t *)PDMDevHlpMMHeapAllocZ(pDevIns, cbFileLanBoot);
         if (pThis->pu8LanBoot)
         {
@@ -1358 +1357 @@
     {
         pu8LanBootBinary = pThis->pu8LanBoot;
-        cbLanBootBinary  = cbFileLanBootAlign;
+        cbLanBootBinary  = cbFileLanBoot;
     }
 
@@ -1371 +1370 @@
         pThis->cbLanBoot = cbLanBootBinary;
 
-        rc = PDMDevHlpROMRegister(pDevIns, VBOX_LANBOOT_SEG << 4,  RT_MAX(cbLanBootBinary, 56*_1K),
+        rc = PDMDevHlpROMRegister(pDevIns, VBOX_LANBOOT_SEG << 4,  RT_MAX(cbLanBootBinary, _64K - (VBOX_LANBOOT_SEG << 4 & 0xffff)),
                                   pu8LanBootBinary, cbLanBootBinary,
                                   PGMPHYS_ROM_FLAGS_SHADOWED, "Net Boot ROM");