Changeset 26601 in vbox

Timestamp:

Feb 17, 2010 11:25:00 AM (15 years ago)

Author:

vboxsync

Message:

host DMI info support

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -1022 +1022 @@
                               "DmiOEMVBoxRev\0"
 #endif
+                              "DmiUseHostInfo\0"
                               "64BitEntry\0"
                               "BootArgs\0"

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

@@ -36 +36 @@
 #include <iprt/string.h>
 #include <iprt/uuid.h>
+#include <iprt/system.h>
 
 #include "../Builtins.h"
@@ -58 +59 @@
 static const char   *s_szDefDmiBIOSReleaseDate  = "12/01/2006";
 static const char   *s_szDefDmiSystemVendor     = "innotek GmbH";
-static const char   *s_szDefDmiSystemProduct    = "VirtualBox";
-static const char   *s_szDefDmiSystemVersion    = "1.2";
+static       char    s_szDefDmiSystemProduct[13]  = "VirtualBox";
+static       char    s_szDefDmiSystemVersion[4]   = "1.2";
 static const char   *s_szDefDmiSystemSerial     = "0";
 static const char   *s_szDefDmiSystemFamily     = "Virtual Machine";
@@ -296 +297 @@
 }
 
-static bool sharedfwChecksumOk(const uint8_t * const au8Data, uint32_t u32Length)
+static bool fwCommonChecksumOk(const uint8_t * const au8Data, uint32_t u32Length)
 {
     uint8_t u8Sum = 0;
@@ -303 +304 @@
     return (u8Sum == 0);
 }
-
+/*
+ * Macmini2,1 - matches Mac Mini
+ */
+static void fwCommonUseHostDMIStrings(void)
+{
+    int rc;
+
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_NAME,
+                                s_szDefDmiSystemProduct,
+                                sizeof s_szDefDmiSystemProduct);
+    if (RT_FAILURE(rc))
+    {
+        // ignore rc?
+    }
+
+    rc = RTSystemQueryDmiString(RTSYSDMISTR_PRODUCT_VERSION,
+                                s_szDefDmiSystemVersion,
+                                sizeof s_szDefDmiSystemVersion);
+    if (RT_FAILURE(rc))
+    {
+        // ignore rc?
+    }
+}
 
 /**
@@ -407 +430 @@
 #endif
 
+    uint8_t fDmiUseHostInfo;
+    int rc = CFGMR3QueryU8Def(pCfg, "DmiUseHostInfo", &fDmiUseHostInfo, 1);
+    if (RT_FAILURE (rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"DmiUseHostInfo\""));
+
+    /* Sync up with host default DMI values */
+    if (fDmiUseHostInfo)
+        fwCommonUseHostDMIStrings();
+
     for  (;; fForceDefault = true, fHideErrors = false)
     {
         int  iStrNr;
-        int  rc;
         char szBuf[256];
         char *pszStr = (char *)pTable;

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

@@ -925 +925 @@
                               "DmiOEMVBoxRev\0"
 #endif
+                              "DmiUseHostInfo\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,