Changeset 3237 in vbox

Timestamp:

Jun 22, 2007 8:21:36 PM (18 years ago)

Author:

vboxsync

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

22229

Message:

Set size and version after memsetting the VMMDev RAM on reset. Patched up the error handling in the constructor.

File:

• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -1649 +1649 @@
      * Initialize data (most of it anyway).
      */
+    /* Save PDM device instance data for future reference. */
+    pData->pDevIns = pDevIns;
+
     /* PCI vendor, just a free bogus value */
     pData->dev.config[0x00] = 0xee;
@@ -1668 +1671 @@
      */
     rc = PDMDevHlpIOPortRegister(pDevIns, RTLOG_DEBUG_PORT, 1, NULL, vmmdevBackdoorLog, NULL, NULL, NULL, "VMMDev backdoor logging");
+    AssertRCReturn(rc, rc);
 
 #ifdef TIMESYNC_BACKDOOR
@@ -1674 +1678 @@
      */
     rc = PDMDevHlpIOPortRegister(pDevIns, 0x505, 1, NULL, vmmdevTimesyncBackdoorWrite, vmmdevTimesyncBackdoorRead, NULL, NULL, "VMMDev timesync backdoor");
+    AssertRCReturn(rc, rc);
 #endif
 
@@ -1712 +1717 @@
 #endif
 
-   /*    * Get the corresponding connector interface
-    */
-   rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->Base, &pData->pDrvBase, "VMM Driver Port");
-   if (VBOX_SUCCESS(rc))
-   {
-       pData->pDrv = (PPDMIVMMDEVCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_VMMDEV_CONNECTOR);
-       if (!pData->pDrv)
-       {
-           AssertMsgFailed(("LUN #0 doesn't have a VMMDev connector interface! rc=%Vrc\n", rc));
-           rc = VERR_PDM_MISSING_INTERFACE;
-       }
+    /*    
+     * Get the corresponding connector interface
+     */
+    rc = PDMDevHlpDriverAttach(pDevIns, 0, &pData->Base, &pData->pDrvBase, "VMM Driver Port");
+    if (VBOX_SUCCESS(rc))
+    {
+        pData->pDrv = (PPDMIVMMDEVCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_VMMDEV_CONNECTOR);
+        if (!pData->pDrv)
+            AssertMsgFailedReturn(("LUN #0 doesn't have a VMMDev connector interface!\n"), VERR_PDM_MISSING_INTERFACE);
 #ifdef VBOX_HGCM
-       else
-       {
-           pData->pHGCMDrv = (PPDMIHGCMCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_HGCM_CONNECTOR);
-           if (!pData->pHGCMDrv)
-           {
-               Log(("LUN #0 doesn't have a HGCM connector interface, HGCM is not supported. rc=%Vrc\n", rc));
-               /* this is not actually an error, just means that there is no support for HGCM */
-           }
-       }
+        pData->pHGCMDrv = (PPDMIHGCMCONNECTOR)pData->pDrvBase->pfnQueryInterface(pData->pDrvBase, PDMINTERFACE_HGCM_CONNECTOR);
+        if (!pData->pHGCMDrv)
+        {
+            Log(("LUN #0 doesn't have a HGCM connector interface, HGCM is not supported. rc=%Vrc\n", rc));
+            /* this is not actually an error, just means that there is no support for HGCM */
+        }
 #endif
-   }
-   else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-   {
-       Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
-       rc = VINF_SUCCESS;
-   }
-   else
-       AssertMsgFailed(("Failed to attach LUN #0! rc=%Vrc\n", rc));
-
+    }
+    else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+    {
+        Log(("%s/%d: warning: no driver attached to LUN #0!\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
+        rc = VINF_SUCCESS;
+    }
+    else
+        AssertMsgFailedReturn(("Failed to attach LUN #0! rc=%Vrc\n", rc), rc);
+
+    /* 
+     * Register saved state and init the HGCM CmdList critsect.
+     */
     rc = PDMDevHlpSSMRegister(pDevIns, "VMMDev", iInstance, VMMDEV_SSM_VERSION, sizeof(*pData),
-                                          NULL, vmmdevSaveState, NULL,
-                                          NULL, vmmdevLoadState, vmmdevLoadStateDone);
-
-    /* Save PDM device instance data for future reference. */
-    pData->pDevIns = pDevIns;
-
+                              NULL, vmmdevSaveState, NULL,
+                              NULL, vmmdevLoadState, vmmdevLoadStateDone);
+    AssertRCReturn(rc, rc);
+
+#ifdef VBOX_HGCM
+    rc = RTCritSectInit(&pData->critsectHGCMCmdList);
+    AssertRCReturn(rc, rc);
+#endif /* VBOX_HGCM */
 
     /*
@@ -1756 +1761 @@
     /** @todo freeing of the RAM. */
     rc = SUPPageAlloc(VMMDEV_RAM_SIZE >> PAGE_SHIFT, (void **)&pData->pVMMDevRAMHC);
-    if (VBOX_FAILURE(rc))
-    {
-        AssertMsgFailed(("VMMDev SUPPageAlloc(%#x,) -> %d\n", VMMDEV_RAM_SIZE, rc));
-    }
-    
-#ifdef VBOX_HGCM
-    rc = RTCritSectInit(&pData->critsectHGCMCmdList);
-    AssertRC(rc);
-#endif /* VBOX_HGCM */
+    AssertMsgRCReturn(rc, ("VMMDev SUPPageAlloc(%#x,) -> %Vrc\n", VMMDEV_RAM_SIZE, rc), rc);
 
     /* initialize the VMMDev memory */
-    memset (pData->pVMMDevRAMHC, 0, sizeof (VMMDevMemory));
     pData->pVMMDevRAMHC->u32Size = sizeof (VMMDevMemory);
     pData->pVMMDevRAMHC->u32Version = VMMDEV_MEMORY_VERSION;
@@ -1800 +1796 @@
     if (pData->pVMMDevRAMHC)
     {
-        memset (pData->pVMMDevRAMHC, 0, sizeof (VMMDevMemory));
+        /* re-initialize the VMMDev memory */
+        memset (pData->pVMMDevRAMHC, 0, VMMDEV_RAM_SIZE);
+        pData->pVMMDevRAMHC->u32Size = sizeof (VMMDevMemory);
+        pData->pVMMDevRAMHC->u32Version = VMMDEV_MEMORY_VERSION;
     }