Changeset 4485 in vbox for trunk/src/VBox

Timestamp:

Sep 3, 2007 8:50:34 AM (17 years ago)

Author:

vboxsync

Message:

Pass the VM's GUID to DevPcBIOS so that the GUID can be stored in DMI/SMBIOS
tables and used by applications.

Location:

trunk/src/VBox

Files:

• Devices/PC/DevPcBios.cpp (modified) (4 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -734 +734 @@
  */
 #define STRCPY(p, s) do { memcpy (p, s, sizeof(s)); p += sizeof(s); } while (0)
-static void pcbiosPlantDMITable(uint8_t *pTable)
+static void pcbiosPlantDMITable(uint8_t *pTable, PRTUUID puuid)
 {
     char *pszStr = (char*)pTable;
@@ -784 +784 @@
     pSystemInf->u8SerialNumber   = iStrNr++;
     STRCPY(pszStr, "0");
+    memcpy(pSystemInf->au8Uuid, puuid, sizeof(RTUUID));
     pSystemInf->u8WakeupType     = 6; /* Power Switch */
     pSystemInf->u8SKUNumber      = 0;
@@ -1092 +1093 @@
                               "DelayBoot\0"
                               "LanBootRom\0"
+                              "UUID\0"
                               "IOAPIC\0"))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -1142 +1144 @@
         return rc;
 
-    pcbiosPlantDMITable(pData->au8DMIPage);
+    /*
+     * Query the machine's UUID for SMBIOS/DMI use.
+     */
+    RTUUID  uuid;
+    rc = CFGMR3QueryBytes(pCfgHandle, "UUID", &uuid, sizeof(uuid));
+    if (VBOX_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"UUID\" failed"));
+
+
+    /* Convert the UUID to network byte order. Not entirely straightforward as parts are MSB already... */
+    uuid.Gen.u32TimeLow = RT_H2BE_U32(uuid.Gen.u32TimeLow);
+    uuid.Gen.u16TimeMid = RT_H2BE_U16(uuid.Gen.u16TimeMid);
+    uuid.Gen.u16TimeHiAndVersion = RT_H2BE_U16(uuid.Gen.u16TimeHiAndVersion);
+    pcbiosPlantDMITable(pData->au8DMIPage, &uuid);
     if (pData->u8IOAPIC)
         pcbiosPlantMPStable(pDevIns, pData->au8DMIPage + 0x100);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -215 +215 @@
     rc = CFGMR3InsertString(pCfg,   "FloppyDevice",         "i82078");              RC_CHECK();
     rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",               fIOAPIC);               RC_CHECK();
+
+    /*
+     * Machine UUID.
+     */
+    Guid uuid;
+    hrc = pMachine->COMGETTER (Id)(uuid.asOutParam());                              H();
+    rc = CFGMR3InsertBytes(pCfg,  "UUID", (void *)uuid.raw(), sizeof(RTUUID));      RC_CHECK();
 
     DeviceType_T bootDevice;