Changeset 33596 in vbox

Timestamp:

Oct 29, 2010 10:47:07 AM (15 years ago)

Author:

vboxsync

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

67207

Message:

Main: Change the 'default default' machine folder to '/home/umoeller/VirtualBox VMs'

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• MediumImpl.cpp (modified) (1 diff)
• SystemPropertiesImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/SystemPropertiesImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -245 +245 @@
 /**
  *  Initializes a new machine instance; this init() variant creates a new, empty machine.
- *  This gets called from VirtualBox::CreateMachine() or VirtualBox::CreateLegacyMachine().
+ *  This gets called from VirtualBox::CreateMachine().
  *
  *  @param aParent      Associated parent object
@@ -771 +771 @@
 
     // uninit media from this machine's media registry, if they're still there
-    mParent->unregisterMachineMedia(getId());
+    Guid uuidMachine(getId());
+    if (!uuidMachine.isEmpty())     // can be empty if we're called from a failure of Machine::init
+        mParent->unregisterMachineMedia(uuidMachine);
 
     /* the lock is no more necessary (SessionMachine is uninitialized) */

trunk/src/VBox/Main/MediumImpl.cpp

@@ -1170 +1170 @@
     {
         strFull = strMachineFolder;
-        strFull += RTPATH_DELIMITER;
+        strFull += RTPATH_SLASH;
         strFull += data.strLocation;
     }

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -547 +547 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    m_strDefaultMachineFolderFull.cloneTo(aDefaultMachineFolder);
+    m->strDefaultMachineFolder.cloneTo(aDefaultMachineFolder);
 
     return S_OK;
@@ -949 +949 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT SystemProperties::setDefaultMachineFolder(const Utf8Str &aPath)
-{
-    Utf8Str path(aPath);
-    if (path.isEmpty())
-        path = "Machines";
-
-    /* get the full file name */
-    Utf8Str folder;
-    int vrc = mParent->calculateFullPath(path, folder);
-    if (RT_FAILURE(vrc))
-        return setError(E_FAIL,
-                        tr("Invalid default machine folder '%s' (%Rrc)"),
-                        path.c_str(),
-                        vrc);
+/**
+ * Internal implementation to set the default machine folder. Gets called
+ * from the public attribute setter as well as loadSettings(). With 4.0,
+ * the "default default" machine folder has changed, and we now require
+ * a full path always.
+ * @param aPath
+ * @return
+ */
+HRESULT SystemProperties::setDefaultMachineFolder(const Utf8Str &strPath)
+{
+    Utf8Str path(strPath);      // make modifiable
+    if (    path.isEmpty()          // used by API calls to reset the default
+         || path == "Machines"      // this value (exactly like this, without path) is stored
+                                    // in VirtualBox.xml if user upgrades from before 4.0 and
+                                    // has not changed the default machine folder
+       )
+    {
+        // new default with VirtualBox 4.0: "$HOME/VirtualBox VMs"
+        char szHome[200]; // RTPATH_MAX is ridiculously large
+        int vrc = RTPathUserHome(szHome, sizeof(szHome));
+        if (RT_FAILURE(vrc))
+            return setError(E_FAIL,
+                            tr("Cannot determine user home directory (%Rrc)"),
+                            vrc);
+
+        path = szHome;
+        path += RTPATH_SLASH_STR "VirtualBox VMs";
+    }
+
+    if (!RTPathStartsWithRoot(path.c_str()))
+        return setError(E_INVALIDARG,
+                        tr("Given default machine folder '%s' is not fully qualified"),
+                        path.c_str());
 
     m->strDefaultMachineFolder = path;
-    m_strDefaultMachineFolderFull = folder;
 
     return S_OK;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -7244 +7244 @@
       <desc>
         Full path to the default directory used to create new or open
-        existing machines when a settings file name contains no
+        existing machines when a machine settings file name contains no
         path.
 
-        The initial value of this property is
-        <tt>&lt;</tt><link to="IVirtualBox::homeFolder">
-          VirtualBox_home</link><tt>&gt;/Machines</tt>.
-
-        <note>
-          Setting this property to @c null or an empty string will restore the
-          initial value.
-        </note>
-        <note>
-          When settings this property, the specified path can be
-          absolute (full path) or relative
-          to the <link to="IVirtualBox::homeFolder">
-            VirtualBox home directory</link>.
-          When reading this property, a full path is
-          always returned.
-        </note>
-        <note>
-          The specified path may not exist, it will be created
-          when necessary.
-        </note>
+        Starting with VirtualBox 4.0, by default, this attribute contains
+        the full path of folder named "VirtualBox VMs" in the user's
+        home directory, which depends on the host platform.
+
+        When setting this attribute, a full path must be specified.
+        Setting this property to @c null or an empty string or the
+        special value "Machines" (for compatibility reasons) will restore
+        that default value.
+
+        If the folder specified herein does not exist, it will be created
+        automatically as needed.
 
         <see>

trunk/src/VBox/Main/include/SystemPropertiesImpl.h

@@ -129 +129 @@
     settings::SystemProperties *m;
 
-    Utf8Str             m_strDefaultMachineFolderFull;
-
     MediumFormatList    m_llMediumFormats;