Changeset 60011 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 14, 2016 8:22:18 AM (9 years ago)

Author:

vboxsync

Message:

VBoxManage: Support the different naming scheme for NVME devices on Linux when creating raw disks

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1661 +1661 @@
                     /* Refer to the correct partition and use offset 0. */
                     char *psz;
+#if defined(RT_OS_LINUX)
+                    /*
+                     * Check whether raw disk points to a nvme disk, the naming scheme
+                     * is slightly different there.
+                     */
+                    if (rawdisk.startsWith("/dev/nvme"))
+                        RTStrAPrintf(&psz,
+                                     "%sp%u",
+                                     rawdisk.c_str(),
+                                     partitions.aPartitions[i].uIndex);
+                    else
+                        RTStrAPrintf(&psz,
+                                     "%s%u",
+                                     rawdisk.c_str(),
+                                     partitions.aPartitions[i].uIndex);
+#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                     RTStrAPrintf(&psz,
-#if defined(RT_OS_LINUX)
-                                 "%s%u",
-#elif defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                                  "%ss%u",
-#endif
                                  rawdisk.c_str(),
                                  partitions.aPartitions[i].uIndex);
+#endif
                     if (!psz)
                     {