Changeset 28569 in vbox

Timestamp:

Apr 21, 2010 4:52:24 PM (15 years ago)

Author:

vboxsync

Message:

Main: CFGM switch to control additional DMI tables

Location:

trunk/src/VBox

Files:

• Devices/EFI/DevEFI.cpp (modified) (1 diff)
• Devices/PC/DevFwCommon.cpp (modified) (3 diffs)
• Devices/PC/DevPcBios.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -1012 +1012 @@
 #endif
                               "DmiUseHostInfo\0"
+                              "DmiExposeAdditionalTables\0"
                               "64BitEntry\0"
                               "BootArgs\0"

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

@@ -476 +476 @@
 #define START_STRUCT(tbl)                                       \
         pszStr                       = (char *)(tbl + 1);       \
-        iStrNr                       = 1;    
+        iStrNr                       = 1;
 
 #define TERM_STRUCT \
@@ -510 +510 @@
     if (fDmiUseHostInfo)
         fwCommonUseHostDMIStrings();
+
+    uint8_t fDmiExposeAdditionalTables;
+    rc = CFGMR3QueryU8Def(pCfg, "DmiExposeAdditionalTables", &fDmiExposeAdditionalTables, 0);
+    if (RT_FAILURE (rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"DmiExposeAdditionalTables\""));
 
     for  (;; fForceDefault = true, fHideErrors = false)
@@ -671 +677 @@
         TERM_STRUCT;
 
-
-        /***************************************
-         * DMI Physical Memory Array (Type 16) *
-         ***************************************/
-        uint64_t u64RamSize;
-        rc = CFGMR3QueryU64(pCfg, "RamSize", &u64RamSize);
-        if (RT_FAILURE (rc))
-            return PDMDEV_SET_ERROR(pDevIns, rc,
-                                N_("Configuration error: Failed to read \"RamSize\""));
-
-        PDMIRAMARRAY pMemArray = (PDMIRAMARRAY)pszStr;
-        CHECKSIZE(sizeof(*pMemArray));
-
-        START_STRUCT(pMemArray);
-        pMemArray->header.u8Type    = 16; /* Physical Memory Array */
-        pMemArray->header.u8Length  = sizeof(*pMemArray);
-        pMemArray->header.u16Handle = 0x0005;
-        pMemArray->u8Location = 0x03; /* Motherboard */
-        pMemArray->u8Use = 0x03; /* System memory */
-        pMemArray->u8MemErrorCorrection = 0x01; /* Other */        
-        uint32_t u32RamSizeK = (uint32_t)(u64RamSize / _1K);
-        pMemArray->u32MaxCapacity = u32RamSizeK; /* RAM size in K */
-        pMemArray->u16MemErrorHandle = 0xfffe; /* No error info structure */
-        pMemArray->u16NumberOfMemDevices = 1;
-        TERM_STRUCT;
-
-        /***************************************
-         * DMI Memory Device (Type 17)         *
-         ***************************************/
-        PDMIMEMORYDEV pMemDev = (PDMIMEMORYDEV)pszStr;
-        CHECKSIZE(sizeof(*pMemDev));
-
-        START_STRUCT(pMemDev);
-        pMemDev->header.u8Type    = 17; /* Memory Device */
-        pMemDev->header.u8Length  = sizeof(*pMemDev);
-        pMemDev->header.u16Handle = 0x0006;
-        pMemDev->u16PhysMemArrayHandle = 0x0005; /* handle of array we belong to */
-        pMemDev->u16MemErrHandle = 0xfffe; /* system doesn't provide this information */
-        pMemDev->u16TotalWidth = 0xffff; /* Unknown */
-        pMemDev->u16DataWidth = 0xffff;  /* Unknown */
-        int16_t u16RamSizeM = (uint16_t)(u64RamSize / _1M);
-        if (u16RamSizeM == 0)
-            u16RamSizeM = 0x400; /* 1G */
-        pMemDev->u16Size = u16RamSizeM; /* RAM size */
-        pMemDev->u8FormFactor = 0x09; /* DIMM */
-        pMemDev->u8DeviceSet = 0x00; /* Not part of a device set */
-        READCFGSTRDEF(pMemDev->u8DeviceLocator, " ", "DIMM 0");
-        READCFGSTRDEF(pMemDev->u8BankLocator, " ", "Bank 0");
-        pMemDev->u8MemoryType = 0x03; /* DRAM */
-        pMemDev->u16TypeDetail = 0; /* Nothing special */
-        pMemDev->u16Speed = 1600; /* Unknown, shall be speed in MHz */
-        READCFGSTR(pMemDev->u8Manufacturer, DmiSystemVendor);
-        READCFGSTRDEF(pMemDev->u8SerialNumber, " ", "00000000");
-        READCFGSTRDEF(pMemDev->u8AssetTag, " ", "00000000");
-        READCFGSTRDEF(pMemDev->u8PartNumber, " ", "00000000");
-        pMemDev->u8Attributes = 0; /* Unknown */
-        TERM_STRUCT;
+        if (fDmiExposeAdditionalTables)
+        {
+            /***************************************
+             * DMI Physical Memory Array (Type 16) *
+             ***************************************/
+            uint64_t u64RamSize;
+            rc = CFGMR3QueryU64(pCfg, "RamSize", &u64RamSize);
+            if (RT_FAILURE (rc))
+                return PDMDEV_SET_ERROR(pDevIns, rc,
+                                        N_("Configuration error: Failed to read \"RamSize\""));
+
+            PDMIRAMARRAY pMemArray = (PDMIRAMARRAY)pszStr;
+            CHECKSIZE(sizeof(*pMemArray));
+
+            START_STRUCT(pMemArray);
+            pMemArray->header.u8Type    = 16; /* Physical Memory Array */
+            pMemArray->header.u8Length  = sizeof(*pMemArray);
+            pMemArray->header.u16Handle = 0x0005;
+            pMemArray->u8Location = 0x03; /* Motherboard */
+            pMemArray->u8Use = 0x03; /* System memory */
+            pMemArray->u8MemErrorCorrection = 0x01; /* Other */
+            uint32_t u32RamSizeK = (uint32_t)(u64RamSize / _1K);
+            pMemArray->u32MaxCapacity = u32RamSizeK; /* RAM size in K */
+            pMemArray->u16MemErrorHandle = 0xfffe; /* No error info structure */
+            pMemArray->u16NumberOfMemDevices = 1;
+            TERM_STRUCT;
+
+            /***************************************
+             * DMI Memory Device (Type 17)         *
+             ***************************************/
+            PDMIMEMORYDEV pMemDev = (PDMIMEMORYDEV)pszStr;
+            CHECKSIZE(sizeof(*pMemDev));
+
+            START_STRUCT(pMemDev);
+            pMemDev->header.u8Type    = 17; /* Memory Device */
+            pMemDev->header.u8Length  = sizeof(*pMemDev);
+            pMemDev->header.u16Handle = 0x0006;
+            pMemDev->u16PhysMemArrayHandle = 0x0005; /* handle of array we belong to */
+            pMemDev->u16MemErrHandle = 0xfffe; /* system doesn't provide this information */
+            pMemDev->u16TotalWidth = 0xffff; /* Unknown */
+            pMemDev->u16DataWidth = 0xffff;  /* Unknown */
+            int16_t u16RamSizeM = (uint16_t)(u64RamSize / _1M);
+            if (u16RamSizeM == 0)
+                u16RamSizeM = 0x400; /* 1G */
+            pMemDev->u16Size = u16RamSizeM; /* RAM size */
+            pMemDev->u8FormFactor = 0x09; /* DIMM */
+            pMemDev->u8DeviceSet = 0x00; /* Not part of a device set */
+            READCFGSTRDEF(pMemDev->u8DeviceLocator, " ", "DIMM 0");
+            READCFGSTRDEF(pMemDev->u8BankLocator, " ", "Bank 0");
+            pMemDev->u8MemoryType = 0x03; /* DRAM */
+            pMemDev->u16TypeDetail = 0; /* Nothing special */
+            pMemDev->u16Speed = 1600; /* Unknown, shall be speed in MHz */
+            READCFGSTR(pMemDev->u8Manufacturer, DmiSystemVendor);
+            READCFGSTRDEF(pMemDev->u8SerialNumber, " ", "00000000");
+            READCFGSTRDEF(pMemDev->u8AssetTag, " ", "00000000");
+            READCFGSTRDEF(pMemDev->u8PartNumber, " ", "00000000");
+            pMemDev->u8Attributes = 0; /* Unknown */
+            TERM_STRUCT;
+        }
 
         /*****************************

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

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1026 +1026 @@
          * EFI subtree.
          */
-        rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                              RC_CHECK();
-        rc = CFGMR3InsertNode(pDev,     "0", &pInst);                               RC_CHECK();
-        rc = CFGMR3InsertInteger(pInst, "Trusted", 1);              /* boolean */   RC_CHECK();
-        rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                           RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "RamSize",          cbRam);                 RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "RamHoleSize",      cbRamHole);             RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cCpus);                 RC_CHECK();
-        rc = CFGMR3InsertString(pCfg,   "EfiRom",           efiRomFile.raw());      RC_CHECK();
-        rc = CFGMR3InsertString(pCfg,   "BootArgs",         Utf8Str(bootArgs).raw()); RC_CHECK();
+        rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                                   RC_CHECK();
+        rc = CFGMR3InsertNode(pDev,     "0", &pInst);                                    RC_CHECK();
+        rc = CFGMR3InsertInteger(pInst, "Trusted", 1);              /* boolean */        RC_CHECK();
+        rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                                RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "RamSize",          cbRam);                      RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "RamHoleSize",      cbRamHole);                  RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cCpus);                      RC_CHECK();
+        rc = CFGMR3InsertString(pCfg,   "EfiRom",           efiRomFile.raw());           RC_CHECK();
+        rc = CFGMR3InsertString(pCfg,   "BootArgs",         Utf8Str(bootArgs).raw());    RC_CHECK();
         rc = CFGMR3InsertString(pCfg,   "DeviceProps",      Utf8Str(deviceProps).raw()); RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",           fIOAPIC);           RC_CHECK();
-        rc = CFGMR3InsertBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid)); RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "64BitEntry", f64BitEntry); /* boolean */   RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "GopMode", u32GopMode);    RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "UgaHorizontalResolution", u32UgaHorisontal); RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "UgaVerticalResolution", u32UgaVertical);   RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",           fIOAPIC);                    RC_CHECK();
+        rc = CFGMR3InsertBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));     RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "64BitEntry", f64BitEntry); /* boolean */        RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "GopMode", u32GopMode);                          RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "UgaHorizontalResolution", u32UgaHorisontal);    RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "UgaVerticalResolution", u32UgaVertical);        RC_CHECK();
 
         /* For OS X guests we'll force passing host's DMI info to the guest */
         if (fExtProfile)
         {
-            rc = CFGMR3InsertInteger(pCfg,  "DmiUseHostInfo", 1);  RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "DmiUseHostInfo", 1);                        RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "DmiExposeAdditionalTables", 1);             RC_CHECK();
         }
     }