Changeset 85887 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 25, 2020 9:05:37 PM (4 years ago)

Author:

vboxsync

Message:

IPRT/RTDvm: Added RTDVMVOLIDX_HOST index. bugref:9224

Location:

trunk/src/VBox/Runtime

Files:

• common/dvm/dvm.cpp (modified) (1 diff)
• common/dvm/dvmbsdlabel.cpp (modified) (1 diff)
• common/dvm/dvmgpt.cpp (modified) (1 diff)
• common/dvm/dvmmbr.cpp (modified) (1 diff)
• include/internal/dvm.h (modified) (1 diff)

trunk/src/VBox/Runtime/common/dvm/dvm.cpp

@@ -737 +737 @@
     AssertReturn(enmIndex > RTDVMVOLIDX_INVALID && enmIndex < RTDVMVOLIDX_END, UINT32_MAX);
 
+    if (enmIndex == RTDVMVOLIDX_HOST)
+    {
+#ifdef RT_OS_WINDOWS
+        enmIndex = RTDVMVOLIDX_USER_VISIBLE;
+#elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS) || defined(RT_OS_DARWIN)
+/** @todo verify darwin, solaris and freebsd matches the linux algo. Check the linux index matching actual linux. */
+        enmIndex = RTDVMVOLIDX_LINUX;
+#else
+# error "PORTME"
+#endif
+    }
+
     return pThis->pVolMgr->pDvmFmtOps->pfnVolumeGetIndex(pThis->hVolFmt, enmIndex);
 }

trunk/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp

@@ -528 +528 @@
 
         case RTDVMVOLIDX_INVALID:
+        case RTDVMVOLIDX_HOST:
         case RTDVMVOLIDX_END:
         case RTDVMVOLIDX_32BIT_HACK:

trunk/src/VBox/Runtime/common/dvm/dvmgpt.cpp

@@ -558 +558 @@
             return pVol->idxEntry;
 
+        case RTDVMVOLIDX_INVALID:
+        case RTDVMVOLIDX_HOST:
+        case RTDVMVOLIDX_END:
         case RTDVMVOLIDX_32BIT_HACK:
-        case RTDVMVOLIDX_INVALID:
-        case RTDVMVOLIDX_END:
             break;
         /* no default! */

trunk/src/VBox/Runtime/common/dvm/dvmmbr.cpp

@@ -825 +825 @@
 
         case RTDVMVOLIDX_INVALID:
+        case RTDVMVOLIDX_HOST:
         case RTDVMVOLIDX_END:
         case RTDVMVOLIDX_32BIT_HACK:

trunk/src/VBox/Runtime/include/internal/dvm.h

@@ -273 +273 @@
      * @returns The requested index. UINT32_MAX on failure.
      * @param   hVolFmt         The format specific volume handle.
-     * @param   enmIndex        The index to get.
+     * @param   enmIndex        The index to get. Never RTDVMVOLIDX_HOST.
      * @sa RTDvmVolumeGetIndex
      */