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

Timestamp:

Nov 18, 2019 12:28:12 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134722

Message:

DevPcBios: Set the new-style device flag. Nits. bugref:9218

Location:

trunk/src/VBox/Devices/PC

Files:

• DevFwCommon.cpp (modified) (2 diffs)
• DevFwCommon.h (modified) (1 diff)
• DevPcBios.cpp (modified) (3 diffs)

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

@@ -433 +433 @@
  * @param   cCpus               Number of VCPUs.
  * @param   pcbDmiTables        Size of DMI data in bytes.
- * @param   pcNumDmiTables      Number of DMI tables.
+ * @param   pcDmiTables         Number of DMI tables.
  */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables, uint16_t *pcNumDmiTables)
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus,
+                          uint16_t *pcbDmiTables, uint16_t *pcDmiTables)
 {
     PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
@@ -938 +939 @@
 
         /* We currently plant 10 DMI tables. Update this if tables number changed. */
-        *pcNumDmiTables = 10;
+        *pcDmiTables = 10;
 
         /* If more fields are added here, fix the size check in DMI_READ_CFG_STR */

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

@@ -25 +25 @@
 
 /* Plant DMI table */
-int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus, uint16_t *pcbDmiTables, uint16_t *pcNumDmiTables);
+int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus,
+                          uint16_t *pcbDmiTables, uint16_t *pcDmiTables);
 void FwCommonPlantSmbiosAndDmiHdrs(PPDMDEVINS pDevIns, uint8_t *pHdr, uint16_t cbDmiTables, uint16_t cNumDmiTables);
 

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

@@ -1202 +1202 @@
     return rc;
 }
+
 
 /**
@@ -1609 +1610 @@
 
     uint16_t cbDmiTables = 0;
-    uint16_t cNumDmiTables = 0;
+    uint16_t cDmiTables = 0;
     rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE,
-                               &uuid, pCfg, pThis->cCpus, &cbDmiTables, &cNumDmiTables);
+                               &uuid, pCfg, pThis->cCpus, &cbDmiTables, &cDmiTables);
     if (RT_FAILURE(rc))
         return rc;
 
     /* Look for _SM_/_DMI_ anchor strings within the BIOS and replace the table headers. */
-    for (unsigned i = 0; i < (pThis->cbPcBios - 16); i += 16)
-    {
-        if (   pThis->pu8PcBios[i + 0x00] == '_'
-            && pThis->pu8PcBios[i + 0x01] == 'S'
-            && pThis->pu8PcBios[i + 0x02] == 'M'
-            && pThis->pu8PcBios[i + 0x03] == '_'
-            && pThis->pu8PcBios[i + 0x10] == '_'
-            && pThis->pu8PcBios[i + 0x11] == 'D'
-            && pThis->pu8PcBios[i + 0x12] == 'M'
-            && pThis->pu8PcBios[i + 0x13] == 'I'
-            && pThis->pu8PcBios[i + 0x14] == '_')
-        {
-            FwCommonPlantSmbiosAndDmiHdrs(pDevIns, pThis->pu8PcBios + i, cbDmiTables, cNumDmiTables);
+    unsigned       offAnchor  = ~0U;
+    unsigned const cbToSearch = pThis->cbPcBios - 32;
+    for (unsigned off = 0; off <= cbToSearch; off += 16)
+    {
+        if (   pThis->pu8PcBios[off + 0x00] != '_'
+            || pThis->pu8PcBios[off + 0x01] != 'S'
+            || pThis->pu8PcBios[off + 0x02] != 'M'
+            || pThis->pu8PcBios[off + 0x03] != '_'
+            || pThis->pu8PcBios[off + 0x10] != '_'
+            || pThis->pu8PcBios[off + 0x11] != 'D'
+            || pThis->pu8PcBios[off + 0x12] != 'M'
+            || pThis->pu8PcBios[off + 0x13] != 'I'
+            || pThis->pu8PcBios[off + 0x14] != '_')
+        { /* likely */ }
+        else
+        {
+            offAnchor = off;
+            FwCommonPlantSmbiosAndDmiHdrs(pDevIns, pThis->pu8PcBios + off, cbDmiTables, cDmiTables);
             break;
         }
     }
+    AssertLogRel(offAnchor <= cbToSearch);
 
     if (pThis->u8IOAPIC)
@@ -1832 +1839 @@
     /* .uReserved0 = */             0,
     /* .szName = */                 "pcbios",
-    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS,
+    /* .fFlags = */                 PDM_DEVREG_FLAGS_DEFAULT_BITS | PDM_DEVREG_FLAGS_NEW_STYLE,
     /* .fClass = */                 PDM_DEVREG_CLASS_ARCH_BIOS,
     /* .cMaxInstances = */          1,