Changeset 64517 in vbox

Timestamp:

Nov 2, 2016 11:07:14 AM (8 years ago)

Author:

vboxsync

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

111666

Message:

Main/Settings: Network name settings have to be optional, otherwise there is trouble with inaccessible VMs when the settings are saved before the network name is updated. Happens easily with VBoxManage.

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (4 diffs)
• VirtualBox-settings.xsd (modified) (1 diff)

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

@@ -3440 +3440 @@
         enmAttachmentType = NetworkAttachmentType_Bridged;
 
-        elmMode.getAttributeValue("name", nic.strBridgedName);  // optional bridged interface name
+        // optional network name, cannot be required or we have trouble with
+        // settings which are saved before configuring the network name
+        elmMode.getAttributeValue("name", nic.strBridgedName);
     }
     else if (elmMode.nameEquals("InternalNetwork"))
@@ -3446 +3448 @@
         enmAttachmentType = NetworkAttachmentType_Internal;
 
-        if (!elmMode.getAttributeValue("name", nic.strInternalNetworkName))    // required network name
-            throw ConfigFileError(this, &elmMode, N_("Required InternalNetwork/@name element is missing"));
+        // optional network name, cannot be required or we have trouble with
+        // settings which are saved before configuring the network name
+        elmMode.getAttributeValue("name", nic.strInternalNetworkName);
     }
     else if (elmMode.nameEquals("HostOnlyInterface"))
@@ -3453 +3456 @@
         enmAttachmentType = NetworkAttachmentType_HostOnly;
 
-        if (!elmMode.getAttributeValue("name", nic.strHostOnlyName))    // required network name
-            throw ConfigFileError(this, &elmMode, N_("Required HostOnlyInterface/@name element is missing"));
+        // optional network name, cannot be required or we have trouble with
+        // settings which are saved before configuring the network name
+        elmMode.getAttributeValue("name", nic.strHostOnlyName);
     }
     else if (elmMode.nameEquals("GenericInterface"))
@@ -3482 +3486 @@
         enmAttachmentType = NetworkAttachmentType_NATNetwork;
 
-        if (!elmMode.getAttributeValue("name", nic.strNATNetworkName))    // required network name
-            throw ConfigFileError(this, &elmMode, N_("Required NATNetwork/@name element is missing"));
+        // optional network name, cannot be required or we have trouble with
+        // settings which are saved before configuring the network name
+        elmMode.getAttributeValue("name", nic.strNATNetworkName);
     }
     else if (elmMode.nameEquals("VDE"))
     {
+        // inofficial hack (VDE networking was never part of the official
+        // settings, so it's not mentioned in VirtualBox-settings.xsd)
         enmAttachmentType = NetworkAttachmentType_Generic;
 

trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

@@ -937 +937 @@
 
 <xsd:complexType name="TNetNATNetwork">
-  <xsd:attribute name="name" type="xsd:string" use="required"/>
+  <xsd:attribute name="name" type="xsd:string"/>
 </xsd:complexType>
 
 <xsd:complexType name="TNetBridged">
-  <xsd:attribute name="name" type="xsd:string" use="required"/>
+  <xsd:attribute name="name" type="xsd:string"/>
 </xsd:complexType>
 
 <xsd:complexType name="TNetInternal">
-  <xsd:attribute name="name" type="xsd:string" use="required"/>
+  <xsd:attribute name="name" type="xsd:string"/>
 </xsd:complexType>
 
 <xsd:complexType name="TNetHostOnly">
-  <xsd:attribute name="name" type="xsd:string" use="required"/>
+  <xsd:attribute name="name" type="xsd:string"/>
 </xsd:complexType>