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

Timestamp:

Jun 25, 2024 11:06:29 AM (7 months ago)

Author:

vboxsync

Message:

doc/manual,include/VBox,Frontends/VBoxManage,HostServices/SharedFolders,
Main/{include,SharedFolder,Console,Machine,VirtualBox.xidl}: Backout
changeset r163634 since it introduces a build dependency on
VirtualBox_XPCOM.h which needs to be built from the VirtualBox.xidl
changes before it can be referenced by the src/VBox/HostServices code.
Need to putback the changes in two parts. bugref:10619

Location:

trunk/src/VBox/Main/xml

Files:

• Settings.cpp (modified) (5 diffs)
• VirtualBox-settings.xsd (modified) (2 diffs)

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

@@ -3793 +3793 @@
 SharedFolder::SharedFolder() :
     fWritable(false),
-    fAutoMount(false),
-    enmSymlinkPolicy(SymlinkPolicy_None)
+    fAutoMount(false)
 {
 }
@@ -3810 +3809 @@
             && fWritable         == g.fWritable
             && fAutoMount        == g.fAutoMount
-            && strAutoMountPoint == g.strAutoMountPoint
-            && enmSymlinkPolicy  == g.enmSymlinkPolicy);
+            && strAutoMountPoint == g.strAutoMountPoint);
 }
 
@@ -5994 +5992 @@
                 pelmFolder->getAttributeValue("autoMount", sf.fAutoMount);
                 pelmFolder->getAttributeValue("autoMountPoint", sf.strAutoMountPoint);
-
-                Utf8Str strTemp;
-                if (pelmFolder->getAttributeValue("symlinkPolicy", strTemp))
-                {
-                    if (strTemp == "forbidden")
-                        sf.enmSymlinkPolicy = SymlinkPolicy_Forbidden;
-                    else if (strTemp == "subtree")
-                        sf.enmSymlinkPolicy = SymlinkPolicy_AllowedInShareSubtree;
-                    else if (strTemp == "relative")
-                        sf.enmSymlinkPolicy = SymlinkPolicy_AllowedToRelativeTargets;
-                    else if (strTemp == "any")
-                        sf.enmSymlinkPolicy = SymlinkPolicy_AllowedToAnyTarget;
-                    else
-                        throw ConfigFileError(this,
-                                              pelmHwChild,
-                                              N_("Invalid value '%s' in SharedFolder/@symlinkPolicy attribute"),
-                                              strTemp.c_str());
-                }
                 hw.llSharedFolders.push_back(sf);
             }
@@ -8329 +8309 @@
             if (sf.strAutoMountPoint.isNotEmpty())
                 pelmThis->setAttribute("autoMountPoint", sf.strAutoMountPoint);
-            const char *pcszSymlinkPolicy;
-            if (sf.enmSymlinkPolicy != SymlinkPolicy_None)
-            {
-                switch (sf.enmSymlinkPolicy)
-                {
-                    default: /*case SymlinkPolicy_Forbidden:*/    pcszSymlinkPolicy = "forbidden";  break;
-                    case SymlinkPolicy_AllowedInShareSubtree:     pcszSymlinkPolicy = "subtree";    break;
-                    case SymlinkPolicy_AllowedToRelativeTargets:  pcszSymlinkPolicy = "relative";   break;
-                    case SymlinkPolicy_AllowedToAnyTarget:        pcszSymlinkPolicy = "any";        break;
-                }
-                pelmThis->setAttribute("symlinkPolicy", pcszSymlinkPolicy);
-            }
         }
     }
@@ -9563 +9531 @@
             return;
         }
-
-        // VirtualBox 7.1 (settings v1.20) adds support for customizable control over Shared Folders symlink creation.
-        if (hardwareMachine.llSharedFolders.size())
-        {
-            for (SharedFoldersList::const_iterator it = hardwareMachine.llSharedFolders.begin();
-                 it != hardwareMachine.llSharedFolders.end();
-                 ++it)
-            {
-                if (it->enmSymlinkPolicy != SymlinkPolicy_None)
-                {
-                    m->sv = SettingsVersion_v1_20;
-                    return;
-                }
-            }
-        }
     }
 

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

@@ -301 +301 @@
     <xsd:enumeration value="VBoxSVGA"/>
     <xsd:enumeration value="QemuRamFB"/>
-  </xsd:restriction>
-</xsd:simpleType>
-
-<xsd:simpleType name="TSymlinkPolicy"> <!-- new since v1.20. -->
-  <xsd:restriction base="xsd:token">
-    <xsd:enumeration value="forbidden"/>
-    <xsd:enumeration value="subtree"/>
-    <xsd:enumeration value="relative"/>
-    <xsd:enumeration value="any"/>
   </xsd:restriction>
 </xsd:simpleType>
@@ -1314 +1305 @@
   <xsd:attribute name="autoMount" type="xsd:boolean" default="false"/>
   <xsd:attribute name="autoMountPoint" type="xsd:string"/>
-  <xsd:attribute name="symlinkPolicy" type="TSymlinkPolicy" default="forbidden"/> <!-- new since v1.20. -->
 </xsd:complexType>