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

Timestamp:

Feb 10, 2020 10:11:30 AM (5 years ago)

Author:

vboxsync

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

136053

Message:

DevPcBios,DevEFI: Include the bit in the SMBIOS data whether the UEFI specification is supported (chapter 7.1.2.2), ticketref:19144

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (1 diff)
• PC/DevFwCommon.cpp (modified) (2 diffs)
• PC/DevFwCommon.h (modified) (1 diff)
• PC/DevPcBios.cpp (modified) (1 diff)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -2639 +2639 @@
      */
     rc = FwCommonPlantDMITable(pDevIns, pThisCC->au8DMIPage, VBOX_DMI_TABLE_SIZE, &pThisCC->aUuid,
-                               pDevIns->pCfg, pThisCC->cCpus, &pThisCC->cbDmiTables, &pThisCC->cNumDmiTables);
+                               pDevIns->pCfg, pThisCC->cCpus, &pThisCC->cbDmiTables, &pThisCC->cNumDmiTables,
+                               true /*fUefi*/);
     AssertRCReturn(rc, rc);
 

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

@@ -434 +434 @@
  * @param   pcbDmiTables        Size of DMI data in bytes.
  * @param   pcDmiTables         Number of DMI tables.
+ * @param   fUefi               Flag whether the UEFI specification is supported.
  */
 int FwCommonPlantDMITable(PPDMDEVINS pDevIns, uint8_t *pTable, unsigned cbMax, PCRTUUID pUuid, PCFGMNODE pCfg, uint16_t cCpus,
-                          uint16_t *pcbDmiTables, uint16_t *pcDmiTables)
+                          uint16_t *pcbDmiTables, uint16_t *pcDmiTables, bool fUefi)
 {
     PCPDMDEVHLPR3 pHlp = pDevIns->pHlpR3;
@@ -651 +652 @@
                                          /* any more?? */
                                          ;
-        pBIOSInf->u8CharacteristicsByte2 = 0
+        pBIOSInf->u8CharacteristicsByte2 = fUefi ? RT_BIT(3) : 0
                                          /* any more?? */
                                          ;

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

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

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

@@ -1612 +1612 @@
     uint16_t cDmiTables = 0;
     rc = FwCommonPlantDMITable(pDevIns, pThis->au8DMIPage, VBOX_DMI_TABLE_SIZE,
-                               &uuid, pCfg, pThis->cCpus, &cbDmiTables, &cDmiTables);
+                               &uuid, pCfg, pThis->cCpus, &cbDmiTables, &cDmiTables,
+                               false /*fUefi*/);
     if (RT_FAILURE(rc))
         return rc;