Changeset 44671 in vbox

Timestamp:

Feb 13, 2013 4:38:47 PM (12 years ago)

Author:

vboxsync

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

83765

Message:

Storage/VHD: Fix incompatibility with Hyper-V. The WI2K and WI2R parent locators are deprecated and Hyper-V refuses to load images with such locators. Furthermore the DataSpace field holds the number of bytes and not sectors to store the parent locator path

File:

• trunk/src/VBox/Storage/VHD.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/VHD.cpp

@@ -305 +305 @@
 
     if (!pvBuf)
-    {
-        rc = VERR_NO_MEMORY;
-        goto out;
-    }
+        return VERR_NO_MEMORY;
 
     switch (RT_BE2H_U32(pLocator->u32Code))
     {
         case VHD_PLATFORM_CODE_WI2R:
-            /* Update plain relative name. */
-            cb = (uint32_t)strlen(pszFilename);
-            if (cb > cbMaxLen)
-            {
-                rc = VERR_FILENAME_TOO_LONG;
-                goto out;
-            }
-            memcpy(pvBuf, pszFilename, cb);
+        {
+            if (RTPathStartsWithRoot(pszFilename))
+            {
+                /* Convert to relative path. */
+                char szPath[RTPATH_MAX];
+                rc = RTPathCalcRelative(szPath, sizeof(szPath), pImage->pszFilename,
+                                        pszFilename);
+                if (RT_SUCCESS(rc))
+                {
+                    /* Update plain relative name. */
+                    cb = (uint32_t)strlen(szPath);
+                    if (cb > cbMaxLen)
+                    {
+                        rc = VERR_FILENAME_TOO_LONG;
+                        break;
+                    }
+                    memcpy(pvBuf, szPath, cb);
+                }
+            }
+            else
+            {
+                /* Update plain relative name. */
+                cb = (uint32_t)strlen(pszFilename);
+                if (cb > cbMaxLen)
+                {
+                    rc = VERR_FILENAME_TOO_LONG;
+                    break;
+                }
+                memcpy(pvBuf, pszFilename, cb);
+            }
             pLocator->u32DataLength = RT_H2BE_U32(cb);
             break;
+        }
         case VHD_PLATFORM_CODE_WI2K:
             /* Update plain absolute name. */
             rc = RTPathAbs(pszFilename, (char *)pvBuf, cbMaxLen);
-            if (RT_FAILURE(rc))
-                goto out;
-            pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf));
+            if (RT_SUCCESS(rc))
+                pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf));
             break;
         case VHD_PLATFORM_CODE_W2RU:
-            /* Update unicode relative name. */
-            rc = vhdFilenameToUtf16(pszFilename, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
-            if (RT_FAILURE(rc))
-                goto out;
-            pLocator->u32DataLength = RT_H2BE_U32(cb);
+            if (RTPathStartsWithRoot(pszFilename))
+            {
+                /* Convert to relative path. */
+                char szPath[RTPATH_MAX];
+                rc = RTPathCalcRelative(szPath, sizeof(szPath), pImage->pszFilename,
+                                        pszFilename);
+                if (RT_SUCCESS(rc))
+                    rc = vhdFilenameToUtf16(szPath, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
+            }
+            else
+            {
+                /* Update unicode relative name. */
+                rc = vhdFilenameToUtf16(pszFilename, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
+            }
+
+            if (RT_SUCCESS(rc))
+                pLocator->u32DataLength = RT_H2BE_U32(cb);
             break;
         case VHD_PLATFORM_CODE_W2KU:
@@ -343 +374 @@
             {
                 rc = VERR_NO_MEMORY;
-                goto out;
+                break;
             }
             rc = RTPathAbs(pszFilename, pszTmp, cbMaxLen);
@@ -349 +380 @@
             {
                 RTMemTmpFree(pszTmp);
-                goto out;
+                break;
             }
             rc = vhdFilenameToUtf16(pszTmp, (uint16_t *)pvBuf, cbMaxLen, &cb, false);
             RTMemTmpFree(pszTmp);
-            if (RT_FAILURE(rc))
-                goto out;
-            pLocator->u32DataLength = RT_H2BE_U32(cb);
+            if (RT_SUCCESS(rc))
+                pLocator->u32DataLength = RT_H2BE_U32(cb);
             break;
         default:
             rc = VERR_NOT_IMPLEMENTED;
-            goto out;
-    }
-    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage,
-                                RT_BE2H_U64(pLocator->u64DataOffset),
-                                pvBuf, RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE);
-
-out:
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
+        rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage,
+                                    RT_BE2H_U64(pLocator->u64DataOffset),
+                                    pvBuf, RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE);
+
     if (pvBuf)
         RTMemTmpFree(pvBuf);
@@ -956 +987 @@
 {
     PVHDPLE pLocator = pDDH->ParentLocatorEntry;
-    /* Relative Windows path. */
-    pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_WI2R);
-    pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH / VHD_SECTOR_SIZE);
+
+    /*
+     * The VHD spec states that the DataSpace field holds the number of sectors
+     * required to store the parent locator path.
+     * As it turned out VPC and Hyper-V store the amount of bytes reserved for the
+     * path and not the number of sectors.
+     */
+
+    /* Unicode absolute Windows path. */
+    pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2KU);
+    pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16));
     pLocator->u64DataOffset = RT_H2BE_U64(u64Offset);
-    u64Offset += VHD_RELATIVE_MAX_PATH;
     pLocator++;
-    /* Absolute Windows path. */
-    pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_WI2K);
-    pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH / VHD_SECTOR_SIZE);
-    pLocator->u64DataOffset = RT_H2BE_U64(u64Offset);
-    u64Offset += VHD_ABSOLUTE_MAX_PATH;
-    pLocator++;
+    u64Offset += VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16);
     /* Unicode relative Windows path. */
     pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2RU);
-    pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16) / VHD_SECTOR_SIZE);
+    pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16));
     pLocator->u64DataOffset = RT_H2BE_U64(u64Offset);
     u64Offset += VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16);
-    pLocator++;
-    /* Unicode absolute Windows path. */
-    pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2KU);
-    pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16) / VHD_SECTOR_SIZE);
-    pLocator->u64DataOffset = RT_H2BE_U64(u64Offset);
-    return u64Offset + VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16);
+    return u64Offset;
 }