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

Timestamp:

Sep 22, 2021 3:10:38 PM (3 years ago)

Author:

vboxsync

Message:

Main/NvramStore,FE/VBoxManage: Allow multiple NVRAM states (UEFI,TPM,etc.) to exist for a VM and and manage them in a central place. This allows to collect them in a single tar archive and provide a single interface to get access to the individual states (work in progress), bugref:10098

File:

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

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

@@ -2584 +2584 @@
         && apicMode == APICMode_APIC
         && llTimeOffset == 0
-        && strLogoImagePath.isEmpty()
-        && strNVRAMPath.isEmpty();
+        && strLogoImagePath.isEmpty();
 }
 
@@ -2606 +2605 @@
             && apicMode                == d.apicMode
             && llTimeOffset            == d.llTimeOffset
-            && strLogoImagePath        == d.strLogoImagePath
-            && strNVRAMPath            == d.strNVRAMPath);
+            && strLogoImagePath        == d.strLogoImagePath);
 }
 
@@ -2855 +2853 @@
             && strLocation     == g.strLocation);
 }
+
+/**
+ * Constructor. Needs to set sane defaults which stand the test of time.
+ */
+NvramSettings::NvramSettings()
+{
+}
+
+/**
+ * Check if all settings have default values.
+ */
+bool NvramSettings::areDefaultSettings() const
+{
+    return strNvramPath.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 NvramSettings::operator==(const NvramSettings &g) const
+{
+    return (this == &g)
+        || (strNvramPath    == g.strNvramPath);
+}
+
 
 /**
@@ -3531 +3556 @@
             && vrdeSettings                   == h.vrdeSettings
             && biosSettings                   == h.biosSettings
+            && nvramSettings                  == h.nvramSettings
             && graphicsAdapter                == h.graphicsAdapter
             && usbSettings                    == h.usbSettings
@@ -4924 +4950 @@
                 pelmBIOSChild->getAttributeValue("value", hw.biosSettings.llTimeOffset);
             if ((pelmBIOSChild = pelmHwChild->findChildElement("NVRAM")))
-                pelmBIOSChild->getAttributeValue("path", hw.biosSettings.strNVRAMPath);
+                pelmBIOSChild->getAttributeValue("path", hw.nvramSettings.strNvramPath);
             if ((pelmBIOSChild = pelmHwChild->findChildElement("SmbiosUuidLittleEndian")))
                 pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fSmbiosUuidLittleEndian);
@@ -6443 +6469 @@
         if (hw.biosSettings.fPXEDebugEnabled)
             pelmBIOS->createChild("PXEDebug")->setAttribute("enabled", hw.biosSettings.fPXEDebugEnabled);
-        if (!hw.biosSettings.strNVRAMPath.isEmpty())
-            pelmBIOS->createChild("NVRAM")->setAttribute("path", hw.biosSettings.strNVRAMPath);
+        if (!hw.nvramSettings.strNvramPath.isEmpty())
+            pelmBIOS->createChild("NVRAM")->setAttribute("path", hw.nvramSettings.strNvramPath);
         if (hw.biosSettings.fSmbiosUuidLittleEndian)
             pelmBIOS->createChild("SmbiosUuidLittleEndian")->setAttribute("enabled", hw.biosSettings.fSmbiosUuidLittleEndian);
@@ -7781 +7807 @@
     if (m->sv < SettingsVersion_v1_18)
     {
-        if (!hardwareMachine.biosSettings.strNVRAMPath.isEmpty())
+        if (!hardwareMachine.nvramSettings.strNvramPath.isEmpty())
         {
             m->sv = SettingsVersion_v1_18;