Changeset 9005 in vbox for trunk

Timestamp:

May 21, 2008 9:42:46 AM (17 years ago)

Author:

vboxsync

Message:

improved + documented mechanism for overwriting DMI information

File:

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

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

@@ -173 +173 @@
     uint8_t         u8CharacteristicsByte1;
     uint8_t         u8CharacteristicsByte2;
+    uint8_t         u8ReleaseMajor;
+    uint8_t         u8ReleaseMinor;
+    uint8_t         u8FirmwareMajor;
+    uint8_t         u8FirmwareMinor;
 } *PDMIBIOSINF;
-AssertCompileSize(DMIBIOSINF, 0x14);
+AssertCompileSize(DMIBIOSINF, 0x18);
 
 /** DMI system information */
@@ -818 +822 @@
     int iStrNr;
     int rc;
-    char *pszDmiVendor, *pszDmiProduct, *pszDmiVersion, *pszDmiRelease, *pszDmiSerial, *pszDmiUuid, *pszDmiFamily;
+    char *pszDmiBIOSVendor, *pszDmiBIOSVersion, *pszDmiBIOSReleaseDate;
+    int  iDmiBIOSReleaseMajor, iDmiBIOSReleaseMinor, iDmiBIOSFirmwareMajor, iDmiBIOSFirmwareMinor;
+    char *pszDmiSystemVendor, *pszDmiSystemProduct, *pszDmiSystemVersion, *pszDmiSystemSerial, *pszDmiSystemUuid, *pszDmiSystemFamily;
 
 #define STRCPY(p, s) \
@@ -830 +836 @@
         p += _len; \
     } while (0)
-#define READCFG(name, variable, default_value) \
+#define READCFGSTR(name, variable, default_value) \
     do { \
         rc = CFGMR3QueryStringAlloc(pCfgHandle, name, & variable); \
@@ -839 +845 @@
                     N_("Configuration error: Querying \"" name "\" as a string failed")); \
     } while (0)
-
-
-    READCFG("DmiVendor",  pszDmiVendor,  "innotek GmbH");
-    READCFG("DmiProduct", pszDmiProduct, "VirtualBox");
-    READCFG("DmiVersion", pszDmiVersion, "1.2");
-    READCFG("DmiRelease", pszDmiRelease, "12/01/2006");
-    READCFG("DmiSerial",  pszDmiSerial,  "0");
-    rc = CFGMR3QueryStringAlloc(pCfgHandle, "DmiUuid", &pszDmiUuid);
+#define READCFGINT(name, variable, default_value) \
+    do { \
+        rc = CFGMR3QueryS32(pCfgHandle, name, & variable); \
+        if (rc == VERR_CFGM_VALUE_NOT_FOUND) \
+            variable = default_value; \
+        else if (VBOX_FAILURE(rc)) \
+            return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, \
+                    N_("Configuration error: Querying \"" name "\" as a Int failed")); \
+    } while (0)
+
+
+    READCFGSTR("DmiBIOSVendor",        pszDmiBIOSVendor,      "innotek GmbH");
+    READCFGSTR("DmiBIOSVersion",       pszDmiBIOSVersion,     "VirtualBox");
+    READCFGSTR("DmiBIOSReleaseDate",   pszDmiBIOSReleaseDate, "12/01/2006");
+    READCFGINT("DmiBIOSReleaseMajor",  iDmiBIOSReleaseMajor,   0);
+    READCFGINT("DmiBIOSReleaseMinor",  iDmiBIOSReleaseMinor,   0);
+    READCFGINT("DmiBIOSFirmwareMajor", iDmiBIOSFirmwareMajor,  0);
+    READCFGINT("DmiBIOSFirmwareMinor", iDmiBIOSFirmwareMinor,  0);
+    READCFGSTR("DmiSystemVendor",      pszDmiSystemVendor,    "innotek GmbH");
+    READCFGSTR("DmiSystemProduct",     pszDmiSystemProduct,   "VirtualBox");
+    READCFGSTR("DmiSystemVersion",     pszDmiSystemVersion,   "1.2");
+    READCFGSTR("DmiSystemSerial",      pszDmiSystemSerial,    "0");
+    rc = CFGMR3QueryStringAlloc(pCfgHandle, "DmiSystemUuid", &pszDmiSystemUuid);
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-        pszDmiUuid = NULL;
+        pszDmiSystemUuid = NULL;
     else if (VBOX_FAILURE(rc))
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                    N_("Configuration error: Querying \"DmiUuid\" as a string failed"));
-    READCFG("DmiFamily",  pszDmiFamily,   "Virtual Machine");
+    READCFGSTR("DmiSystemFamily",    pszDmiSystemFamily,    "Virtual Machine");
 
     /* DMI BIOS information */
     PDMIBIOSINF pBIOSInf         = (PDMIBIOSINF)pszStr;
-    pszStr                       = (char *)(pBIOSInf + 1);
+
+    pszStr = (char *)&pBIOSInf->u8ReleaseMajor;
+    pBIOSInf->header.u8Length    = RT_OFFSETOF(DMIBIOSINF, u8ReleaseMajor);
+
+    /* don't set these fields by default for legacy compatibility */
+    if (iDmiBIOSReleaseMajor != 0 || iDmiBIOSReleaseMinor != 0)
+    {
+        pszStr = (char *)&pBIOSInf->u8FirmwareMajor;
+        pBIOSInf->header.u8Length = RT_OFFSETOF(DMIBIOSINF, u8FirmwareMajor);
+        pBIOSInf->u8ReleaseMajor  = iDmiBIOSReleaseMajor;
+        pBIOSInf->u8ReleaseMinor  = iDmiBIOSReleaseMinor;
+        if (iDmiBIOSFirmwareMajor != 0 || iDmiBIOSFirmwareMinor != 0)
+        {
+            pszStr = (char *)(pBIOSInf + 1);
+            pBIOSInf->header.u8Length = sizeof(DMIBIOSINF);
+            pBIOSInf->u8FirmwareMajor = iDmiBIOSFirmwareMajor;
+            pBIOSInf->u8FirmwareMinor = iDmiBIOSFirmwareMinor;
+        }
+    }
+
     iStrNr                       = 1;
     pBIOSInf->header.u8Type      = 0; /* BIOS Information */
-    pBIOSInf->header.u8Length    = sizeof(*pBIOSInf);
     pBIOSInf->header.u16Handle   = 0x0000;
     pBIOSInf->u8Vendor           = iStrNr++;
-    STRCPY(pszStr, pszDmiVendor);
+    STRCPY(pszStr, pszDmiBIOSVendor);
     pBIOSInf->u8Version          = iStrNr++;
-    STRCPY(pszStr, pszDmiProduct);
+    STRCPY(pszStr, pszDmiBIOSVersion);
     pBIOSInf->u16Start           = 0xE000;
     pBIOSInf->u8Release          = iStrNr++;
-    STRCPY(pszStr, pszDmiRelease);
+    STRCPY(pszStr, pszDmiBIOSReleaseDate);
     pBIOSInf->u8ROMSize          = 1; /* 128K */
     pBIOSInf->u64Characteristics = RT_BIT(4)   /* ISA is supported */
@@ -893 +932 @@
     pSystemInf->header.u16Handle = 0x0001;
     pSystemInf->u8Manufacturer   = iStrNr++;
-    STRCPY(pszStr, pszDmiVendor);
+    STRCPY(pszStr, pszDmiSystemVendor);
     pSystemInf->u8ProductName    = iStrNr++;
-    STRCPY(pszStr, pszDmiProduct);
+    STRCPY(pszStr, pszDmiSystemProduct);
     pSystemInf->u8Version        = iStrNr++;
-    STRCPY(pszStr, pszDmiVersion);
+    STRCPY(pszStr, pszDmiSystemVersion);
     pSystemInf->u8SerialNumber   = iStrNr++;
-    STRCPY(pszStr, pszDmiSerial);
+    STRCPY(pszStr, pszDmiSystemSerial);
 
     RTUUID uuid;
-    if (pszDmiUuid)
-    {
-        int rc = RTUuidFromStr(&uuid, pszDmiUuid);
+    if (pszDmiSystemUuid)
+    {
+        int rc = RTUuidFromStr(&uuid, pszDmiSystemUuid);
         if (VBOX_FAILURE(rc))
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -918 +957 @@
     pSystemInf->u8SKUNumber      = 0;
     pSystemInf->u8Family         = iStrNr++;
-    STRCPY(pszStr, pszDmiFamily);
+    STRCPY(pszStr, pszDmiSystemFamily);
     *pszStr++                    = '\0';
 
@@ -926 +965 @@
 #undef READCFG
 
-    MMR3HeapFree(pszDmiVendor);
-    MMR3HeapFree(pszDmiProduct);
-    MMR3HeapFree(pszDmiVersion);
-    MMR3HeapFree(pszDmiRelease);
-    MMR3HeapFree(pszDmiSerial);
-    MMR3HeapFree(pszDmiUuid);
-    MMR3HeapFree(pszDmiFamily);
+    MMR3HeapFree(pszDmiBIOSVendor);
+    MMR3HeapFree(pszDmiBIOSVersion);
+    MMR3HeapFree(pszDmiBIOSReleaseDate);
+    MMR3HeapFree(pszDmiSystemVendor);
+    MMR3HeapFree(pszDmiSystemProduct);
+    MMR3HeapFree(pszDmiSystemVersion);
+    MMR3HeapFree(pszDmiSystemSerial);
+    MMR3HeapFree(pszDmiSystemUuid);
+    MMR3HeapFree(pszDmiSystemFamily);
 
     return VINF_SUCCESS;
@@ -1222 +1263 @@
                               "UUID\0"
                               "IOAPIC\0"
-                              "DmiVendor\0"
-                              "DmiProduct\0"
-                              "DmiVersion\0"
-                              "DmiSerial\0"
-                              "DmiUuid\0"
-                              "DmiFamily\0"))
+                              "DmiBIOSVendor\0"
+                              "DmiBIOSVersion\0"
+                              "DmiBIOSReleaseDate\0"
+                              "DmiBIOSReleaseMajor\0"
+                              "DmiBIOSReleaseMinor\0"
+                              "DmiBIOSFirmwareMajor\0"
+                              "DmiBIOSFirmwareMinor\0"
+                              "DmiSystemFamily\0"
+                              "DmiSystemProduct\0"
+                              "DmiSystemSerial\0"
+                              "DmiSystemUuid\0"
+                              "DmiSystemVendor\0"
+                              "DmiSystemVersion\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
                                 N_("Invalid configuraton for  device pcbios device"));