Changeset 81557 in vbox

Timestamp:

Oct 28, 2019 7:37:58 AM (5 years ago)

Author:

vboxsync

Message:

DevEFI.cpp,DevPcBios.cpp: The SMBIOS spec requires UUID to be stored in little endian format (see chapter 7.2.1), introduce a CFGM key to control the behavior from the Main API to not cause trouble with existing guests (Windows reactivation etc.)

Location:

trunk/src/VBox/Devices

Files:

• EFI/DevEFI.cpp (modified) (2 diffs)
• PC/DevPcBios.cpp (modified) (2 diffs)

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

@@ -2386 +2386 @@
                                   "McfgLength|"
                                   "UUID|"
+                                  "UuidLe|"
                                   "IOAPIC|"
                                   "APIC|"
@@ -2463 +2464 @@
                                 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);
+    bool fUuidLe;
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "UuidLe", &fUuidLe, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"UuidLe\" failed"));
+
+    if (!fUuidLe)
+    {
+        /*
+         * UUIDs are stored little endian actually (see chapter 7.2.1 System — UUID
+         * of the DMI/SMBIOS spec) but to not force reactivation of existing guests we have
+         * to carry this bug along... (see also DevPcBios.cpp when changing this)
+         *
+         * 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);
+    }
     memcpy(&pThisCC->aUuid, &uuid, sizeof pThisCC->aUuid);
 

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

@@ -1216 +1216 @@
                               "PXEDebug\0"
                               "UUID\0"
+                              "UuidLe\0"
                               "IOAPIC\0"
                               "APIC\0"
@@ -1575 +1576 @@
                                 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);
+    bool fUuidLe;
+    rc = CFGMR3QueryBoolDef(pCfg, "UuidLe", &fUuidLe, false);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"UuidLe\" failed"));
+
+    if (!fUuidLe)
+    {
+        /*
+         * UUIDs are stored little endian actually (see chapter 7.2.1 System — UUID
+         * of the DMI/SMBIOS spec) but to not force reactivation of existing guests we have
+         * to carry this bug along... (see also DevEFI.cpp when changing this)
+         *
+         * 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);
+    }
+
     uint16_t cbDmiTables = 0;
     uint16_t cNumDmiTables = 0;