Changeset 60025 in vbox

Timestamp:

Mar 15, 2016 9:28:41 AM (9 years ago)

Author:

vboxsync

Message:

VBoxManage: Tweak the rawdisk fix for nvme devices to be more versatile if other devices pick up the new naming scheme. The code checks now whether the last character of the string is a digit

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <VBox/log.h>
 
+#include <iprt/ctype.h>
 #include <iprt/file.h>
 #include <iprt/getopt.h>
@@ -1663 +1664 @@
 #if defined(RT_OS_LINUX)
                     /*
-                     * Check whether raw disk points to a nvme disk, the naming scheme
-                     * is slightly different there.
+                     * Check whether raw disk ends with a digit. In that case
+                     * insert a p before adding the partition number.
+                     * This is used for nvme devices only currently which look like
+                     * /dev/nvme0n1p1 but might be extended to other devices in the
+                     * future.
                      */
-                    if (rawdisk.startsWith("/dev/nvme"))
+                    size_t cchRawDisk = rawdisk.length();
+                    if (RT_C_IS_DIGIT(pszRawName[cchRawDisk - 1]))
                         RTStrAPrintf(&psz,
                                      "%sp%u",