Changeset 35959 in vbox for trunk/src/VBox

Timestamp:

Feb 14, 2011 2:30:03 PM (14 years ago)

Author:

vboxsync

Message:

PCI: further R0/driver work

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxPci/VBoxPci.c (modified) (2 diffs)
• VMM/VMMR0/VMMR0.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPci.c

@@ -85 +85 @@
 }
 
+/**
+ * @copydoc RAWPCIDEVPORT:: pfnRelease
+ */
+DECLHIDDEN(int) vboxPciDevInit(PRAWPCIDEVPORT pThis, uint32_t fFlags)
+{
+    return VINF_SUCCESS;
+}
+
 
 /**
@@ -113 +121 @@
     pNew->DevPort.pfnRetain             = vboxPciDevRetain;
     pNew->DevPort.pfnRelease            = vboxPciDevRelease;
+    pNew->DevPort.pfnInit               = vboxPciDevInit;
     pNew->DevPort.u32VersionEnd         = RAWPCIDEVPORT_VERSION;
     
     rc = RTSpinlockCreate(&pNew->hSpinlock);
-    if (RT_SUCCESS(rc))
-    {
-        *ppDevPort = &pNew->DevPort;
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = pNew->DevPort.pfnInit(&pNew->DevPort, fFlags);
+        if (RT_SUCCESS(rc))
+        {
+            *ppDevPort = &pNew->DevPort;
+        }
+        else
+        {
+            RTSpinlockDestroy(pNew->hSpinlock);
+            RTMemFree(pNew);
+        }
         return rc;
     }

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

@@ -1179 +1179 @@
             if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PPCIRAWSENDREQ)pReqHdr)->pSession, pSession) || idCpu != NIL_VMCPUID)
                 return VERR_INVALID_PARAMETER;
-            return PciRawR0ProcessReq(pSession, (PPCIRAWSENDREQ)pReqHdr);
+            return PciRawR0ProcessReq(pSession, pVM, (PPCIRAWSENDREQ)pReqHdr);
 #endif
         /*
@@ -1553 +1553 @@
     RTAssertMsg2V(pszFormat, va);
 }
-