Changeset 5212 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 9, 2007 6:43:56 PM (17 years ago)

Author:

vboxsync

Message:

Solaris.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.cpp (modified) (13 diffs)
• DrvHostBase.h (modified) (3 diffs)
• DrvHostDVD.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VBox storage devices:
- * Host base drive access driver
+ * DrvHostBase - Host base drive access driver.
  */
 
@@ -46 +45 @@
 # include <errno.h>
 # include <stropts.h>
+# include <malloc.h>
 # include <sys/dkio.h>
+extern "C" char *getfullblkname(char *);
 
 #elif defined(RT_OS_WINDOWS)
@@ -734 +735 @@
 
 
+#ifndef RT_OS_SOLARIS
 /**
  * Wrapper for open / RTFileOpen / IOKit.
@@ -920 +922 @@
     return rc;
 
-#elif defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
+#elif defined(RT_OS_LINUX)
     /** @todo we've got RTFILE_O_NON_BLOCK now. Change the code to use RTFileOpen. */
     int FileDevice = open(pThis->pszDeviceOpen, (pThis->fReadOnlyConfig ? O_RDONLY : O_RDWR) | O_NONBLOCK);
@@ -934 +936 @@
 }
 
+#else   /* RT_OS_SOLARIS */
+
+/**
+ * Solaris wrapper for RTFileOpen.
+ *
+ * Solaris has to deal with two filehandles, a block and a raw one. Rather than messing
+ * with drvHostBaseOpen's function signature & body, having a seperate one is better.
+ *
+ * @returns VBox status code.
+ */
+static int drvHostBaseOpen(PDRVHOSTBASE pThis, PRTFILE pBlockFileDevice, PRTFILE pFileRawDevice, bool fReadOnly)
+{
+    unsigned fFlags = (pThis->fReadOnlyConfig ? RTFILE_O_READ : RTFILE_O_READWRITE) | RTFILE_O_NON_BLOCK;
+    int rc = RTFileOpen(pBlockFileDevice, pThis->pszDeviceOpen, fFlags);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTFileOpen(pFileRawDevice, pThis->pszRawDeviceOpen, fFlags);
+        if (RT_FAILURE(rc))
+            RTFileClose(BlockFileDevice);
+    }
+    return rc;
+}
+#endif  /* RT_OS_SOLARIS */
+
 
 /**
@@ -951 +977 @@
 
     RTFILE FileDevice;
+#ifdef RT_OS_SOLARIS
+    RTFILE FileRawDevice;
+    int rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, pThis->fReadOnlyConfig);
+#else
     int rc = drvHostBaseOpen(pThis, &FileDevice, pThis->fReadOnlyConfig);
+#endif
     if (VBOX_FAILURE(rc))
     {
@@ -957 +988 @@
         {
             LogFlow(("%s-%d: drvHostBaseReopen: '%s' - retry readonly (%Vrc)\n", pThis->pDrvIns->pDrvReg->szDriverName, pThis->pDrvIns->iInstance, pThis->pszDeviceOpen, rc));
+#ifdef RT_OS_SOLARIS
+            rc = drvHostBaseOpen(pThis, &FileDevice, &FileRawDevice, false);
+#else
             rc = drvHostBaseOpen(pThis, &FileDevice, false);
+#endif
         }
         if (VBOX_FAILURE(rc))
@@ -969 +1004 @@
     else
         pThis->fReadOnly = pThis->fReadOnlyConfig;
+
+#ifdef RT_OS_SOLARIS
+    if (pThis->FileRawDevice != NIL_RTFILE)
+        RTFileClose(pThis->FileRawDevice);
+    pThis->FileRawDevice = FileRawDevice;
+#endif
 
     if (pThis->FileDevice != NIL_RTFILE)
@@ -1023 +1064 @@
      */
     struct dk_minfo MediaInfo;
-    if (ioctl(pThis->FileDevice, DKIOCGMEDIAINFO, &MediaInfo) == 0)
+    if (ioctl(pThis->FileRawDevice, DKIOCGMEDIAINFO, &MediaInfo) == 0)
     {
         *pcb = MediaInfo.dki_capacity * (uint64_t)MediaInfo.dki_lbsize;
@@ -1562 +1603 @@
 #endif
 
+#ifdef RT_OS_SOLARIS
+    if (pThis->FileRawDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->FileRawDevice);
+        AssertRC(rc);
+        pThis->FileRawDevice = NIL_RTFILE;
+    }
+
+    if (pThis->pszRawDeviceOpen)
+    {
+        RTStrFree(pThis->pszRawDeviceOpen);
+        pThis->pszRawDeviceOpen = NULL;
+    }
+#endif
+
     if (pThis->pszDevice)
     {
@@ -1619 +1675 @@
     pThis->FileDevice                       = NIL_RTFILE;
 #endif
+#ifdef RT_OS_SOLARIS
+    pThis->FileRawDevice                    = NIL_RTFILE;
+#endif
     pThis->enmType                          = enmType;
     //pThis->cErrors                          = 0;
@@ -1758 +1817 @@
     pThis->fUnitMask = 1 << iBit;
     RTStrAPrintf(&pThis->pszDeviceOpen, "\\\\.\\%s", pThis->pszDevice);
+
+#elif defined(RT_OS_SOLARIS)
+    char *pszBlockDevName = getfullblkname(pThis->pszDevice);
+    if (!pszBlockDevName)
+        return VERR_NO_MEMORY;
+    pThis->pszDeviceOpen = RTStrDup(pszBlockDevName);  /* for RTStrFree() */
+    free(pszBlockDevName);
+    pThis->pszRawDeviceOpen = RTStrDup(pThis->pszDevice);
+
 #else
     pThis->pszDeviceOpen = RTStrDup(pThis->pszDevice);
 #endif
+
     if (!pThis->pszDeviceOpen)
         return VERR_NO_MEMORY;
@@ -1859 +1928 @@
         pThis->FileDevice = NIL_RTFILE;
 #endif
-        /* Disable CD/DVD passthrough in case it was enabled. Would cause
+#ifdef RT_OS_SOLARIS
+        pThis->FileRawDevice = NIL_RTFILE;
+#endif
+
+        /*
+         * Disable CD/DVD passthrough in case it was enabled. Would cause
          * weird failures later when the guest issues commands. These would
          * all fail because of the invalid file handle. So use the normal
          * virtual CD/DVD code, which deals more gracefully with unavailable
-         * "media" - actually a complete drive in this case. */
+         * "media" - actually a complete drive in this case.
+         */
         pThis->IBlock.pfnSendCmd = NULL;
         AssertMsgFailed(("Could not open host device %s, rc=%Vrc\n", pszDevice, rc));

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VBox storage devices:
- * Host base drive access driver
+ * DrvHostBase - Host base drive access driver.
  */
 
@@ -53 +52 @@
     /** Device name to open (RTStrFree). */
     char                   *pszDeviceOpen;
+#ifdef RT_OS_SOLARIS
+    /** Device name of raw device (RTStrFree). */
+    char                   *pszRawDeviceOpen;
+#endif
     /** Uuid of the drive. */
     RTUUID                  Uuid;
@@ -77 +80 @@
     /** The filehandle of the device. */
     RTFILE                  FileDevice;
+#endif
+#ifdef RT_OS_SOLARIS
+    /** The raw filehandle of the device. */
+    RTFILE                  FileRawDevice;
 #endif
 

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ +1 @@
+/* $Id$ */
 /** @file
- *
- * VBox storage devices:
- * Host DVD block driver
+ * DrvHostDVD - Host DVD block driver.
  */
 
@@ -132 +131 @@
 
 #elif defined(RT_OS_SOLARIS)
-        rc = ioctl(pThis->FileDevice, DKIOCEJECT, 0);
+        rc = ioctl(pThis->FileRawDevice, DKIOCEJECT, 0);
         if (rc < 0)
         {
@@ -221 +220 @@
 
 #elif defined(RT_OS_SOLARIS)
-    int rc = ioctl(pThis->FileDevice, fLock ? DKIOCLOCK : DKIOCUNLOCK, 0);
+    int rc = ioctl(pThis->FileRawDevice, fLock ? DKIOCLOCK : DKIOCUNLOCK, 0);
     if (rc < 0)
     {
@@ -326 +325 @@
     /* Need to pass the previous state and DKIO_NONE for the first time. */
     static dkio_state DeviceState = DKIO_NONE;
-    int rc2 = ioctl(pThis->FileDevice, DKIOCSTATE, &DeviceState);
+    int rc2 = ioctl(pThis->FileRawDevice, DKIOCSTATE, &DeviceState);
     if (rc2 == 0)
     {
@@ -509 +508 @@
 
     /* We need root privileges for user-SCSI under Solaris. */
-    rc = ioctl(pThis->FileDevice, USCSICMD, &usc);
+    rc = ioctl(pThis->FileRawDevice, USCSICMD, &usc);
     if (rc < 0)
     {
@@ -625 +624 @@
     if (*pEffUserID == 0)
         return VINF_SUCCESS;
+    else
+    {
+        if (seteuid(0) == 0)
+        {
+            *pEffUserID = 0;
+            return VINF_SUCCESS;
+        }
+        else
+            return VERR_PERMISSION_DENIED;
+    }
+}
+
+/**
+ * Setuid wrapper to relinquish root access.
+ *
+ * @returns VBox error code.
+ * @param   pUserID        Pointer to user ID.
+ * @param   pEffUserID     Pointer to effective user ID.
+ */
+static int solarisExitRootMode(uid_t *pUserID, uid_t *pEffUserID)
+{
+    /* Get back to user mode. */
+    if (*pEffUserID == 0)
+    {
+        if (seteuid(*pUserID) == 0)
+        {
+            *pEffUserID = *pUserID;
+            return VINF_SUCCESS;
+        }
+        else
+            return VERR_PERMISSION_DENIED;
+    }
+    return VINF_SUCCESS;
+}
+
+/**
+ * Setuid wrapper to gain root access.
+ *
+ * @returns VBox error code.
+ * @param   pUserID        Pointer to user ID.
+ * @param   pEffUserID     Pointer to effective user ID.
+ */
+static int solarisEnterRootMode(uid_t *pUserID, uid_t *pEffUserID)
+{
+    /* Increase privilege if required */
+    if (*pEffUserID == 0)
+        return VINF_SUCCESS;
     if (seteuid(0) == 0)
     {
@@ -720 +766 @@
         rc = DRVHostBaseInitFinish(pThis);
     }
-
     if (VBOX_FAILURE(rc))
     {