Changeset 29613 in vbox

Timestamp:

May 18, 2010 11:40:07 AM (14 years ago)

Author:

vboxsync

Message:

Pass back return code in the request packet to preserve informational codes. (VMMR3CallR0 chokes on them)

Location:

trunk

Files:

• include/VBox/gmm.h (modified) (1 diff)
• src/VBox/VMM/GMM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (1 diff)

trunk/include/VBox/gmm.h

@@ -486 +486 @@
     /** Guest OS type. */
     VBOXOSFAMILY                enmGuestOS;
-    /** Alignment. */
-    uint32_t                    u32Alignment;
+    /** return code. */
+    uint32_t                    rc;
     /** Module name */
     char                        szName[GMM_SHARED_MODULE_MAX_NAME_STRING];

trunk/src/VBox/VMM/GMM.cpp

@@ -385 +385 @@
     pReq->Hdr.u32Magic  = SUPVMMR0REQHDR_MAGIC;
     pReq->Hdr.cbReq     = RT_OFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]);
-    return VMMR3CallR0(pVM, VMMR0_DO_GMM_REGISTER_SHARED_MODULE, 0, &pReq->Hdr);
+    int rc = VMMR3CallR0(pVM, VMMR0_DO_GMM_REGISTER_SHARED_MODULE, 0, &pReq->Hdr);
+    if (rc == VINF_SUCCESS)
+        rc = pReq->rc;
+    return rc;
 }
 

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -3621 +3621 @@
     AssertMsgReturn(pReq->Hdr.cbReq >= sizeof(*pReq) && pReq->Hdr.cbReq == RT_UOFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER);
 
-    return GMMR0RegisterSharedModule(pVM, idCpu, pReq->enmGuestOS, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions);
+    /* Pass back return code in the request packet to preserve informational codes. (VMMR3CallR0 chokes on them) */
+    pReq->rc = GMMR0RegisterSharedModule(pVM, idCpu, pReq->enmGuestOS, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions);
+    return VINF_SUCCESS;
 }