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

Timestamp:

Nov 15, 2010 5:18:30 PM (14 years ago)

Author:

vboxsync

Message:

Devices/PC: clean up LAN boot ROM code a bit, do the proper size check and allow files which are not a multiple of 4K in size.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevPcBios.cpp (modified) (4 diffs)
• DevPcBios.h (modified) (4 diffs)

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

@@ -1282 +1282 @@
     }
 
-    uint64_t cbFileLanBoot;
+    uint64_t cbFileLanBoot, cbFileLanBootAlign;
     const uint8_t *pu8LanBootBinary = NULL;
     uint64_t cbLanBootBinary;
@@ -1299 +1299 @@
             if (RT_SUCCESS(rc))
             {
-                if (    RT_ALIGN(cbFileLanBoot, _4K) != cbFileLanBoot
-                    ||  cbFileLanBoot > _64K)
+                cbFileLanBootAlign = RT_ALIGN(cbFileLanBoot, _4K);
+                if (cbFileLanBootAlign > _64K - (VBOX_LANBOOT_SEG << 4 & 0xffff))
                     rc = VERR_TOO_MUCH_DATA;
             }
@@ -1325 +1325 @@
          * Allocate buffer for the LAN boot ROM data.
          */
-        pThis->pu8LanBoot = (uint8_t *)PDMDevHlpMMHeapAlloc(pDevIns, cbFileLanBoot);
+        pThis->pu8LanBoot = (uint8_t *)PDMDevHlpMMHeapAllocZ(pDevIns, cbFileLanBootAlign);
         if (pThis->pu8LanBoot)
         {
@@ -1358 +1358 @@
     {
         pu8LanBootBinary = pThis->pu8LanBoot;
-        cbLanBootBinary  = cbFileLanBoot;
+        cbLanBootBinary  = cbFileLanBootAlign;
     }
 
     /*
      * Map the Network Boot ROM into memory.
-     * Currently there is a fixed mapping: 0x000c8000 to 0x000cffff contains
-     * the (up to) 32 kb ROM image.
+     * Currently there is a fixed mapping: 0x000d2000 to 0x000dffff contains
+     * the (up to) 56 kb ROM image.
      */
     if (pu8LanBootBinary)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 
 /** @def VBOX_DMI_TABLE_BASE */
-#define VBOX_DMI_TABLE_BASE          0xe1000
-#define VBOX_DMI_TABLE_VER           0x25
-#define VBOX_DMI_TABLE_ENTR          5
+#define VBOX_DMI_TABLE_BASE         0xe1000
+#define VBOX_DMI_TABLE_VER          0x25
+#define VBOX_DMI_TABLE_ENTR         5
 
 /** def VBOX_DMI_TABLE_SIZE
@@ -31 +31 @@
  * the MPS table.
  */
-#define VBOX_DMI_TABLE_SIZE          352
-
-/** @def VBOX_VMI_BIOS_BASE
- *
- * Must be located between 0xC0000 and 0xDEFFF, otherwise it will not be
- * recognized as regular BIOS.
- */
-#define VBOX_VMI_BIOS_BASE           0xdf000
+#define VBOX_DMI_TABLE_SIZE         352
 
 
@@ -45 +38 @@
  * Should usually start right after the DMI BIOS page
  */
-#define VBOX_LANBOOT_SEG             0xe200
+#define VBOX_LANBOOT_SEG            0xe200
 
-#define VBOX_SMBIOS_MAJOR_VER        2
-#define VBOX_SMBIOS_MINOR_VER        5
-#define VBOX_SMBIOS_MAXSS            0xff   /* Not very accurate */
+#define VBOX_SMBIOS_MAJOR_VER       2
+#define VBOX_SMBIOS_MINOR_VER       5
+#define VBOX_SMBIOS_MAXSS           0xff   /* Not very accurate */
 
 #endif