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

Timestamp:

Feb 8, 2011 1:20:04 AM (14 years ago)

Author:

vboxsync

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

69897

Message:

Main, VMM, vboxshell: more PCI work (persistent settings, logging, more driver API), API consumer in vboxshell

File:

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

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

@@ -91 +91 @@
 
 /** VirtualBox XML settings version number substring ("x.y")  */
-#define VBOX_XML_VERSION        "1.11"
+#define VBOX_XML_VERSION        "1.12"
 
 /** VirtualBox XML settings version platform substring */
@@ -320 +320 @@
                 else if (ulMinor == 11)
                     m->sv = SettingsVersion_v1_11;
-                else if (ulMinor > 11)
+                else if (ulMinor == 12)
+                    m->sv = SettingsVersion_v1_12;
+                else if (ulMinor > 12)
                     m->sv = SettingsVersion_Future;
             }
@@ -340 +342 @@
         // creating new settings file:
         m->strSettingsVersionFull = VBOX_XML_VERSION_FULL;
-        m->sv = SettingsVersion_v1_11;
+        m->sv = SettingsVersion_v1_12;
     }
 }
@@ -818 +820 @@
             break;
 
+        case SettingsVersion_v1_12:
+            pcszVersion = "1.12";
+            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.11";
-            m->sv = SettingsVersion_v1_10;
+            pcszVersion = "1.12";
+            m->sv = SettingsVersion_v1_12;
         break;
 
@@ -846 +852 @@
  * set the "sv" member to the required settings version that is to
  * be written. For newly created files, the settings version will be
- * the latest (1.11); for files read in from disk earlier, it will be
+ * the latest (1.12); for files read in from disk earlier, it will be
  * the settings version indicated in the file. However, this method
  * will silently make sure that the settings version is always
@@ -1648 +1654 @@
                   && (strNotificationPatterns   == h.strNotificationPatterns)
                   && (ioSettings                == h.ioSettings)
+                  && (pciAttachments            == h.pciAttachments)
                 )
             );
@@ -2717 +2724 @@
                     pelmBandwidthGroup->getAttributeValue("maxMbPerSec", gr.cMaxMbPerSec);
                     hw.ioSettings.llBandwidthGroups.push_back(gr);
+                }
+            }
+        }  else if (pelmHwChild->nameEquals("HostPci")) {
+            const xml::ElementNode *pelmDevices;
+
+            if ((pelmDevices = pelmHwChild->findChildElement("Devices")))
+            {
+                xml::NodesLoop nl2(*pelmDevices, "Device");
+                const xml::ElementNode *pelmDevice;
+                while ((pelmDevice = nl2.forAllNodes()))
+                {
+                    HostPciDeviceAttachment hpda;
+
+                    if (!pelmDevice->getAttributeValue("host", hpda.uHostAddress))
+                         throw ConfigFileError(this, pelmDevice, N_("Missing Device/@host attribute"));
+
+                    if (!pelmDevice->getAttributeValue("host", hpda.uGuestAddress))
+                         throw ConfigFileError(this, pelmDevice, N_("Missing Device/@guest attribute"));
+
+                    /* name is optional */
+                    pelmDevice->getAttributeValue("name", hpda.strDeviceName);
+
+                    hw.pciAttachments.push_back(hpda);
                 }
             }
@@ -3863 +3893 @@
     }
 
+    if (m->sv >= SettingsVersion_v1_12)
+    {
+        xml::ElementNode *pelmPci = pelmHardware->createChild("HostPci");
+        xml::ElementNode *pelmPciDevices = pelmPci->createChild("Devices");
+
+        for (HostPciDeviceAttachmentList::const_iterator it = hw.pciAttachments.begin();
+             it != hw.pciAttachments.end();
+             ++it)
+        {
+            const HostPciDeviceAttachment &hpda = *it;
+
+            xml::ElementNode *pelmThis = pelmPciDevices->createChild("Device");
+
+            pelmThis->setAttribute("host",  hpda.uHostAddress);
+            pelmThis->setAttribute("guest", hpda.uGuestAddress);
+            pelmThis->setAttribute("name",  hpda.strDeviceName);
+        }
+    }
+
     xml::ElementNode *pelmGuest = pelmHardware->createChild("Guest");
     pelmGuest->setAttribute("memoryBalloonSize", hw.ulMemoryBalloonSize);
@@ -4418 +4467 @@
 void MachineConfigFile::bumpSettingsVersionIfNeeded()
 {
+    if (m->sv < SettingsVersion_v1_12)
+    {
+        // VirtualBox 4.1 adds PCI passthrough
+        if (hardwareMachine.pciAttachments.size())
+            m->sv = SettingsVersion_v1_12;
+    }
+
     if (m->sv < SettingsVersion_v1_11)
     {