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

Timestamp:

Mar 9, 2012 10:00:56 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76749

Message:

Main: Extended IMachine and the settings XML with three tracing related properties.

File:

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

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

@@ -834 +834 @@
             break;
 
+        case SettingsVersion_v1_13:
+            pcszVersion = "1.13";
+            break;
+
         case SettingsVersion_Future:
             // can be set if this code runs on XML files that were created by a future version of VBox;
             // in that case, downgrade to current version when writing since we can't write future versions...
-            pcszVersion = "1.12";
-            m->sv = SettingsVersion_v1_12;
+            pcszVersion = "1.13";
+            m->sv = SettingsVersion_v1_13;
             break;
 
@@ -1755 +1759 @@
                   && (storage               == s.storage)                   // deep compare
                   && (llChildSnapshots      == s.llChildSnapshots)          // deep compare
+                  && debugging              == s.debugging
                 )
            );
@@ -3160 +3165 @@
 
 /**
+ * Called for reading the <Debugging> element under <Machine> or <Snapshot>.
+ */
+void MachineConfigFile::readDebugging(const xml::ElementNode *pElmDebugging, Debugging *pDbg)
+{
+    if (!pElmDebugging || m->sv < SettingsVersion_v1_13)
+        return;
+
+    const xml::ElementNode * const pelmTracing = pElmDebugging->findChildElement("Tracing");
+    if (pelmTracing)
+    {
+        pelmTracing->getAttributeValue("enabled", pDbg->fTracingEnabled);
+        pelmTracing->getAttributeValue("allowTracingToAccessVM", pDbg->fAllowTracingToAccessVM);
+        pelmTracing->getAttributeValue("config", pDbg->strTracingConfig);
+    }
+}
+
+/**
  * Called initially for the <Snapshot> element under <Machine>, if present,
  * to store the snapshot's data into the given Snapshot structure (which is
@@ -3231 +3253 @@
         // with data from old DVDDrive and FloppyDrive elements
         readDVDAndFloppies_pre1_9(*pelmHardware, snap.storage);
+
+    readDebugging(elmSnapshot.findChildElement("Debugging"), &snap.debugging);
 }
 
@@ -3379 +3403 @@
             else if (pelmMachineChild->nameEquals("MediaRegistry"))
                 readMediaRegistry(*pelmMachineChild, mediaRegistry);
+            else if (pelmMachineChild->nameEquals("Debugging"))
+                readDebugging(pelmMachineChild, &debugging);
         }
 
@@ -4301 +4327 @@
 
 /**
+ * Creates a <Debugging> node under elmParent and then writes out the XML
+ * keys under that. Called for both the <Machine> node and for snapshots.
+ *
+ * @param pElmParent    Pointer to the parent element.
+ * @param pDbg          Pointer to the debugging settings.
+ */
+void MachineConfigFile::buildDebuggingXML(xml::ElementNode *pElmParent, const Debugging *pDbg)
+{
+    if (m->sv < SettingsVersion_v1_13 || pDbg->areDefaultSettings())
+        return;
+
+    xml::ElementNode *pElmDebugging = pElmParent->createChild("Debugging");
+    xml::ElementNode *pElmTracing   = pElmDebugging->createChild("Tracing");
+    pElmTracing->setAttribute("enabled", pDbg->fTracingEnabled);
+    pElmTracing->setAttribute("allowTracingToAccessVM", pDbg->fAllowTracingToAccessVM);
+    pElmTracing->setAttribute("config", pDbg->strTracingConfig);
+}
+
+/**
  * Writes a single snapshot into the DOM tree. Initially this gets called from MachineConfigFile::write()
  * for the root snapshot of a machine, if present; elmParent then points to the <Snapshots> node under the
@@ -4329 +4374 @@
                                     // we only skip removable media for OVF, but we never get here for OVF
                                     // since snapshots never get written then
+    buildDebuggingXML(pelmSnapshot, &snap.debugging);
 
     if (snap.llChildSnapshots.size())
@@ -4476 +4522 @@
                                !!(fl & BuildMachineXML_SkipRemovableMedia),
                                pllElementsWithUuidAttributes);
+    buildDebuggingXML(&elmMachine, &debugging);
 }
 
@@ -4591 +4638 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_13)
+    {
+        // VirtualBox 4.2 adds tracing.
+        if (!debugging.areDefaultSettings())
+            m->sv = SettingsVersion_v1_13;
+    }
+
     if (m->sv < SettingsVersion_v1_12)
     {