Changeset 38818 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 21, 2011 5:10:25 PM (13 years ago)

Author:

vboxsync

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

74113

Message:

Main/Medium+Snapshot+VirtualBox: extend the API in a compatible way to support skipping the automatic directory creation when creating new images.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• include/VirtualBoxImpl.h (modified) (1 diff)
• src-server/MediumImpl.cpp (modified) (11 diffs)
• src-server/SnapshotImpl.cpp (modified) (2 diffs)
• src-server/VirtualBoxImpl.cpp (modified) (3 diffs)

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

@@ -9783 +9783 @@
       </desc>
     </const>
+    <const name="NoCreateDir" value="0x40000000">
+      <desc>
+        Special flag which suppresses automatic creation of the subdirectory.
+        Only used when passing the medium variant as an input parameter.
+      </desc>
+    </const>
   </enum>
 

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

@@ -282 +282 @@
     HRESULT saveRegistries(const GuidList &llRegistriesThatNeedSaving);
 
-    static HRESULT ensureFilePathExists(const Utf8Str &strFileName);
+    static HRESULT ensureFilePathExists(const Utf8Str &strFileName, bool fCreate);
 
     static HRESULT handleUnexpectedExceptions (RT_SRC_POS_DECL);

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -6448 +6448 @@
             if (capabilities & MediumFormatCapabilities_File)
             {
-                rc = VirtualBox::ensureFilePathExists(location);
+                rc = VirtualBox::ensureFilePathExists(location, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */);
                 if (FAILED(rc))
                     throw rc;
@@ -6459 +6459 @@
                                location.c_str(),
                                task.mSize,
-                               task.mVariant,
+                               task.mVariant & ~MediumVariant_NoCreateDir,
                                NULL,
                                &geo,
@@ -6615 +6615 @@
             if (capabilities & MediumFormatCapabilities_File)
             {
-                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation);
+                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */);
                 if (FAILED(rc))
                     throw rc;
@@ -6623 +6623 @@
                                targetFormat.c_str(),
                                targetLocation.c_str(),
-                               task.mVariant | VD_IMAGE_FLAGS_DIFF,
+                               (task.mVariant & ~MediumVariant_NoCreateDir) | VD_IMAGE_FLAGS_DIFF,
                                NULL,
                                targetId.raw(),
@@ -7118 +7118 @@
             if (capabilities & MediumFormatCapabilities_File)
             {
-                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation);
+                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */);
                 if (FAILED(rc))
                     throw rc;
@@ -7181 +7181 @@
                                  false /* fMoveByRename */,
                                  0 /* cbSize */,
-                                 task.mVariant,
+                                 task.mVariant & ~MediumVariant_NoCreateDir,
                                  targetId.raw(),
                                  VD_OPEN_FLAGS_NORMAL,
@@ -7199 +7199 @@
                                    task.midxSrcImageSame,
                                    task.midxDstImageSame,
-                                   task.mVariant,
+                                   task.mVariant & ~MediumVariant_NoCreateDir,
                                    targetId.raw(),
                                    VD_OPEN_FLAGS_NORMAL,
@@ -7789 +7789 @@
             if (capabilities & MediumFormatCapabilities_File)
             {
-                rc = VirtualBox::ensureFilePathExists(targetLocation);
+                rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */);
                 if (FAILED(rc))
                     throw rc;
@@ -7807 +7807 @@
                              false /* fMoveByRename */,
                              0 /* cbSize */,
-                             task.mVariant,
+                             task.mVariant & ~MediumVariant_NoCreateDir,
                              NULL /* pDstUuid */,
                              VD_OPEN_FLAGS_NORMAL | VD_OPEN_FLAGS_SEQUENTIAL,
@@ -7914 +7914 @@
             if (capabilities & MediumFormatCapabilities_File)
             {
-                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation);
+                HRESULT rc = VirtualBox::ensureFilePathExists(targetLocation, !(task.mVariant & MediumVariant_NoCreateDir) /* fCreate */);
                 if (FAILED(rc))
                     throw rc;
@@ -7975 +7975 @@
                              false /* fMoveByRename */,
                              0 /* cbSize */,
-                             task.mVariant,
+                             task.mVariant & ~MediumVariant_NoCreateDir,
                              targetId.raw(),
                              VD_OPEN_FLAGS_NORMAL,

trunk/src/VBox/Main/src-server/SnapshotImpl.cpp

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1431 +1431 @@
     {
         // ensure the directory for the saved state file exists
-        HRESULT rc = VirtualBox::ensureFilePathExists(strStateFilePath);
+        HRESULT rc = VirtualBox::ensureFilePathExists(strStateFilePath, true /* fCreate */);
         if (FAILED(rc)) return rc;
     }

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -3932 +3932 @@
 
 /**
- * Creates the path to the specified file according to the path information
- * present in the file name.
+ * Checks if the path to the specified file exists, according to the path
+ * information present in the file name. Optionally the path is created.
  *
  * Note that the given file name must contain the full path otherwise the
@@ -3939 +3939 @@
  * directory which is normally unknown.
  *
- * @param aFileName     Full file name which path needs to be created.
- *
- * @return Extended error information on failure to create the path.
+ * @param aFileName     Full file name which path is checked/created.
+ * @param aCreate       Flag if the path should be created if it doesn't exist.
+ *
+ * @return Extended error information on failure to check/create the path.
  */
 /* static */
-HRESULT VirtualBox::ensureFilePathExists(const Utf8Str &strFileName)
+HRESULT VirtualBox::ensureFilePathExists(const Utf8Str &strFileName, bool fCreate)
 {
     Utf8Str strDir(strFileName);
@@ -3950 +3951 @@
     if (!RTDirExists(strDir.c_str()))
     {
-        int vrc = RTDirCreateFullPath(strDir.c_str(), 0777);
-        if (RT_FAILURE(vrc))
-            return setErrorStatic(E_FAIL,
-                                  Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"),
-                                             strDir.c_str(),
-                                             vrc));
+        if (fCreate)
+        {
+            int vrc = RTDirCreateFullPath(strDir.c_str(), 0777);
+            if (RT_FAILURE(vrc))
+                return setErrorStatic(VBOX_E_IPRT_ERROR,
+                                      Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"),
+                                                 strDir.c_str(),
+                                                 vrc));
+        }
+        else
+            return setErrorStatic(VBOX_E_IPRT_ERROR,
+                                  Utf8StrFmt(tr("Directory '%s' does not exist"),
+                                             strDir.c_str()));
     }