Changeset 8835 in vbox for trunk/src/VBox

Timestamp:

May 15, 2008 9:18:29 AM (17 years ago)

Author:

vboxsync

Message:

Implement getting the block device size on Solaris in creating raw disk VMDKs.

File:

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

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

@@ -53 +53 @@
 #include <windows.h>
 #include <winioctl.h>
-#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+#elif defined(RT_OS_LINUX) || defined(RT_OS_DARWIN) || defined(RT_OS_SOLARIS)
 #include <errno.h>
 #include <sys/ioctl.h>
@@ -69 +69 @@
 #include <sys/disk.h>
 #endif /* RT_OS_DARWIN */
+#ifdef RT_OS_SOLARIS
+#include <stropts.h>
+#include <sys/dkio.h>
+#include <sys/vtoc.h>
+#endif /* RT_OS_SOLARIS */
 
 using namespace com;
@@ -831 +836 @@
     else
     {
-        RTPrintf("File '%s' is no disk\n", rawdisk.raw());
+        RTPrintf("File '%s' is no block device\n", rawdisk.raw());
         return VERR_INVALID_PARAMETER;
     }
@@ -852 +857 @@
     else
     {
-        RTPrintf("File '%s' is no disk\n", rawdisk.raw());
+        RTPrintf("File '%s' is no block device\n", rawdisk.raw());
+        return VERR_INVALID_PARAMETER;
+    }
+#elif defined(RT_OS_SOLARIS)
+    struct stat DevStat;
+    if (!fstat(RawFile, &DevStat) && S_ISBLK(DevStat.st_mode))
+    {
+        struct dk_minfo mediainfo;
+        if (!ioctl(RawFile, DKIOCGMEDIAINFO, &mediainfo))
+            cbSize = mediainfo.dki_capacity * mediainfo.dki_lbsize;
+        else
+            return RTErrConvertFromErrno(errno);
+    }
+    else
+    {
+        RTPrintf("File '%s' is no block device\n", rawdisk.raw());
         return VERR_INVALID_PARAMETER;
     }