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

Timestamp:

Apr 12, 2011 12:27:10 PM (14 years ago)

Author:

vboxsync

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

71125

Message:

Main/Medium: only create the target path if the destination is file based

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (9 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -6188 +6188 @@
         {
             /* ensure the directory exists */
-            rc = VirtualBox::ensureFilePathExists(location);
-            if (FAILED(rc))
-                throw rc;
+            if (capabilities & VD_CAP_FILE)
+            {
+                rc = VirtualBox::ensureFilePathExists(location);
+                if (FAILED(rc))
+                    throw rc;
+            }
 
             VDGEOMETRY geo = { 0, 0, 0 }; /* auto-detect */
@@ -6352 +6355 @@
 
             /* ensure the target directory exists */
-            rc = VirtualBox::ensureFilePathExists(targetLocation);
-            if (FAILED(rc))
-                throw rc;
+            if (capabilities & VD_CAP_FILE)
+            {
+                rc = VirtualBox::ensureFilePathExists(targetLocation);
+                if (FAILED(rc))
+                    throw rc;
+            }
 
             vrc = VDCreateDiff(hdd,
@@ -6833 +6839 @@
             Utf8Str targetFormat(pTarget->m->strFormat);
             Utf8Str targetLocation(pTarget->m->strLocationFull);
+            uint64_t capabilities = pTarget->m->formatObj->getCapabilities();
 
             Assert(   pTarget->m->state == MediumState_Creating
@@ -6844 +6851 @@
 
             /* ensure the target directory exists */
-            rc = VirtualBox::ensureFilePathExists(targetLocation);
-            if (FAILED(rc))
-                throw rc;
+            if (capabilities & VD_CAP_FILE)
+            {
+                rc = VirtualBox::ensureFilePathExists(targetLocation);
+                if (FAILED(rc))
+                    throw rc;
+            }
 
             PVBOXHDD targetHdd;
@@ -7472 +7482 @@
             Utf8Str targetFormat(task.mFormat->getId());
             Utf8Str targetLocation(task.mFilename);
+            uint64_t capabilities = task.mFormat->getCapabilities();
 
             Assert(m->state == MediumState_LockedRead);
@@ -7479 +7490 @@
 
             /* ensure the target directory exists */
-            rc = VirtualBox::ensureFilePathExists(targetLocation);
-            if (FAILED(rc))
-                throw rc;
+            if (capabilities & VD_CAP_FILE)
+            {
+                rc = VirtualBox::ensureFilePathExists(targetLocation);
+                if (FAILED(rc))
+                    throw rc;
+            }
 
             PVBOXHDD targetHdd;
@@ -7590 +7604 @@
             Utf8Str targetFormat(m->strFormat);
             Utf8Str targetLocation(m->strLocationFull);
+            uint64_t capabilities = task.mFormat->getCapabilities();
 
             Assert(   m->state == MediumState_Creating
@@ -7600 +7615 @@
 
             /* ensure the target directory exists */
-            rc = VirtualBox::ensureFilePathExists(targetLocation);
-            if (FAILED(rc))
-                throw rc;
+            if (capabilities & VD_CAP_FILE)
+            {
+                rc = VirtualBox::ensureFilePathExists(targetLocation);
+                if (FAILED(rc))
+                    throw rc;
+            }
 
             PVBOXHDD targetHdd;