Changeset 91213 in vbox for trunk/src/VBox/Main/xml

Timestamp:

Sep 10, 2021 5:58:08 PM (3 years ago)

Author:

vboxsync

Message:

Main,FE/VBoxManage: Add the necessary Main API bits to control the trusted platform module settings as well as implementing support in VBoxManage, bugref:10075

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (5 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2830 +2830 @@
  * Constructor. Needs to set sane defaults which stand the test of time.
  */
+TpmSettings::TpmSettings() :
+    tpmType(TpmType_None)
+{
+}
+
+/**
+ * Check if all settings have default values.
+ */
+bool TpmSettings::areDefaultSettings() const
+{
+    return    tpmType     == TpmType_None
+           && strLocation.isEmpty();
+}
+
+/**
+ * Comparison operator. This gets called from MachineConfigFile::operator==,
+ * which in turn gets called from Machine::saveSettings to figure out whether
+ * machine settings have really changed and thus need to be written out to disk.
+ */
+bool TpmSettings::operator==(const TpmSettings &g) const
+{
+    return (this == &g)
+        || (   tpmType         == g.tpmType
+            && strLocation     == g.strLocation);
+}
+
+/**
+ * Constructor. Needs to set sane defaults which stand the test of time.
+ */
 USBController::USBController() :
     enmType(USBControllerType_Null)
@@ -3504 +3533 @@
             && graphicsAdapter                == h.graphicsAdapter
             && usbSettings                    == h.usbSettings
+            && tpmSettings                    == h.tpmSettings
             && llNetworkAdapters              == h.llNetworkAdapters
             && llSerialPorts                  == h.llSerialPorts
@@ -4924 +4954 @@
                 hw.storage.llStorageControllers.push_back(sctl);
             }
+        }
+        else if (pelmHwChild->nameEquals("TrustedPlatformModule"))
+        {
+            Utf8Str strTpmType;
+            if (pelmHwChild->getAttributeValue("type", strTpmType))
+            {
+                if (strTpmType == "None")
+                    hw.tpmSettings.tpmType = TpmType_None;
+                else if (strTpmType == "v1_2")
+                    hw.tpmSettings.tpmType = TpmType_v1_2;
+                else if (strTpmType == "v2_0")
+                    hw.tpmSettings.tpmType = TpmType_v2_0;
+                else if (strTpmType == "Host")
+                    hw.tpmSettings.tpmType = TpmType_Host;
+                else if (strTpmType == "Swtpm")
+                    hw.tpmSettings.tpmType = TpmType_Swtpm;
+                else
+                    throw ConfigFileError(this,
+                                          pelmHwChild,
+                                          N_("Invalid value '%s' in TrustedPlatformModule/@type"),
+                                          strTpmType.c_str());
+            }
+
+            pelmHwChild->getAttributeValue("location", hw.tpmSettings.strLocation);
         }
         else if (   (m->sv <= SettingsVersion_v1_14)
@@ -6393 +6447 @@
         if (hw.biosSettings.fSmbiosUuidLittleEndian)
             pelmBIOS->createChild("SmbiosUuidLittleEndian")->setAttribute("enabled", hw.biosSettings.fSmbiosUuidLittleEndian);
+    }
+
+    if (!hw.tpmSettings.areDefaultSettings())
+    {
+        xml::ElementNode *pelmTpm = pelmHardware->createChild("TrustedPlatformModule");
+
+        const char *pcszTpm;
+        switch (hw.tpmSettings.tpmType)
+        {
+            default:
+            case TpmType_None:
+                pcszTpm = "None";
+                break;
+            case TpmType_v1_2:
+                pcszTpm = "v1_2";
+                break;
+            case TpmType_v2_0:
+                pcszTpm = "v2_0";
+                break;
+            case TpmType_Host:
+                pcszTpm = "Host";
+                break;
+            case TpmType_Swtpm:
+                pcszTpm = "Swtpm";
+                break;
+        }
+        pelmTpm->setAttribute("type", pcszTpm);
+        pelmTpm->setAttribute("location", hw.tpmSettings.strLocation);
     }
 
@@ -7687 +7769 @@
             return;
         }
+
+        // VirtualBox 6.2 adds a Trusted Platform Module.
+        if (   hardwareMachine.tpmSettings.tpmType != TpmType_None
+            || hardwareMachine.tpmSettings.strLocation.isNotEmpty())
+        {
+            m->sv = SettingsVersion_v1_19;
+            return;
+        }
     }