Changeset 46732 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 22, 2013 7:25:08 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86655

Message:

AHCI: Fix assertion during hotplug (event semaphore not created)

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (8 diffs)

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

@@ -37 +37 @@
 *   Header Files                                                               *
 *******************************************************************************/
-//#define DEBUG
 #define LOG_GROUP LOG_GROUP_DEV_AHCI
 #include <VBox/vmm/pdmdev.h>
@@ -5310 +5309 @@
  *
  * @returns VBox status code.
+ * @param   pDevIns     The device instance.
  * @param   pAhciReq    The request state.
  * @param   cbTransfer  Amount of bytes to allocate.
@@ -5333 +5333 @@
 }
 
+/**
+ * Frees the I/O memory of the given request and updates the guest buffer if necessary.
+ *
+ * @returns nothing.
+ * @param   pDevIns      The device instance.
+ * @param   pAhciReq     The request state.
+ * @param   fCopyToGuest Flag whether to update the guest buffer if necessary.
+ *                       Nothing is copied if false even if the request was a read.
+ */
 static void ahciIoBufFree(PPDMDEVINS pDevIns, PAHCIREQ pAhciReq,
                           bool fCopyToGuest)
@@ -7446 +7455 @@
 static DECLCALLBACK(int)  ahciR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
-    PAHCI       pAhci = PDMINS_2_DATA(pDevIns, PAHCI);
-    PAHCIPort   pAhciPort = &pAhci->ahciPort[iLUN];
+    PAHCI       pThis = PDMINS_2_DATA(pDevIns, PAHCI);
+    PAHCIPort   pAhciPort = &pThis->ahciPort[iLUN];
     int         rc;
 
@@ -7453 +7462 @@
 
     /* the usual paranoia */
-    AssertMsg(iLUN < pAhci->cPortsImpl, ("iLUN=%u", iLUN));
+    AssertMsg(iLUN < pThis->cPortsImpl, ("iLUN=%u", iLUN));
     AssertRelease(!pAhciPort->pDrvBase);
     AssertRelease(!pAhciPort->pDrvBlock);
@@ -7484 +7493 @@
         else
             pAhciPort->fAsyncInterface = false;
+
+        rc = SUPSemEventCreate(pThis->pSupDrvSession, &pAhciPort->hEvtProcess);
+        if (RT_FAILURE(rc))
+            return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                       N_("AHCI: Failed to create SUP event semaphore"));
 
         /* Create the async IO thread. */
@@ -7967 +7981 @@
             }
 
+            rc = SUPSemEventCreate(pThis->pSupDrvSession, &pAhciPort->hEvtProcess);
+            if (RT_FAILURE(rc))
+                return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                           N_("AHCI: Failed to create SUP event semaphore"));
+
             rc = PDMDevHlpThreadCreate(pDevIns, &pAhciPort->pAsyncIOThread, pAhciPort, ahciAsyncIOLoop,
                                        ahciAsyncIOLoopWakeUp, 0, RTTHREADTYPE_IO, szName);
@@ -7972 +7991 @@
                 return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                            N_("AHCI: Failed to create worker thread %s"), szName);
-
-            rc = SUPSemEventCreate(pThis->pSupDrvSession, &pAhciPort->hEvtProcess);
-            if (RT_FAILURE(rc))
-                return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
-                                           N_("AHCI: Failed to create SUP event semaphore"));
         }
         else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)