Changeset 36422 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Mar 25, 2011 8:20:08 AM (14 years ago)

Author:

vboxsync

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

70782

Message:

PCI: sync

Location:

trunk/src/VBox/HostDrivers/VBoxPci

Files:

• VBoxPci.c (modified) (2 diffs)
• VBoxPciInternal.h (modified) (2 diffs)

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

@@ -521 +521 @@
 static DECLCALLBACK(int)  vboxPciFactoryInitVm(PRAWPCIFACTORY       pFactory,
                                                PVM                  pVM,
-                                               PRAWPCIVM            pPciData)
+                                               PRAWPCIVM            pVmData)
 {
     PVBOXRAWPCIDRVVM pThis = (PVBOXRAWPCIDRVVM)RTMemAllocZ(sizeof(VBOXRAWPCIDRVVM));
@@ -532 +532 @@
     if (RT_SUCCESS(rc))
     {
-        rc = vboxPciOsInitVm(pThis, pVM);
+        rc = vboxPciOsInitVm(pThis, pVM, pVmData);
+#ifdef VBOX_WITH_IOMMU
+        /* If IOMMU notification routine in pVmData->pfnContigMemInfo
+           is not set - we have no IOMMU hardware. */
+#endif
 
         if (RT_SUCCESS(rc))
         {
-            pPciData->pDriverData = pThis;
+            pVmData->pDriverData = pThis;
             return VINF_SUCCESS;
         }

trunk/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h

@@ -26 +26 @@
 #ifdef RT_OS_LINUX
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
 # ifdef DEBUG_nike
 #  define VBOX_WITH_IOMMU
@@ -139 +139 @@
 DECLHIDDEN(void) vboxPciShutdown(PVBOXRAWPCIGLOBALS pGlobals);
 
-DECLHIDDEN(int)  vboxPciOsInitVm(PVBOXRAWPCIDRVVM pThis,   PVM pVM);
+DECLHIDDEN(int)  vboxPciOsInitVm(PVBOXRAWPCIDRVVM pThis,   PVM pVM, PRAWPCIVM pVmData);
 DECLHIDDEN(void) vboxPciOsDeinitVm(PVBOXRAWPCIDRVVM pThis, PVM pVM);