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

Timestamp:

Mar 29, 2011 12:52:21 PM (14 years ago)

Author:

vboxsync

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

70843

Message:

PCI: fixed init-order issue

Location:

trunk/src/VBox/HostDrivers/VBoxPci

Files:

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

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

@@ -384 +384 @@
 }
 
-DECLHIDDEN(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, PCIRAWPOWERSTATE  aState)
+DECLHIDDEN(int) vboxPciDevPowerStateChange(PRAWPCIDEVPORT pPort, PCIRAWPOWERSTATE  aState, uint64_t *pu64Param)
 {
     PVBOXRAWPCIINS pThis = DEVPORT_2_VBOXRAWPCIINS(pPort);
@@ -392 +392 @@
 
     rc = vboxPciOsDevPowerStateChange(pThis, aState);
+
+    if (aState == PCIRAW_POWER_ON)
+    {
+        /*
+         * Let virtual device know about VM caps.
+         */
+        *pu64Param = VBOX_DRV_VMDATA(pThis)->pPerVmData->fVmCaps;
+    }
+    else
+        pu64Param = 0;
+
 
     vboxPciDevUnlock(pThis);
@@ -544 +555 @@
                 pVmData->fVmCaps |= PCIRAW_VMFLAGS_HAS_IOMMU;
 #endif
+            pThis->pPerVmData = pVmData;
             pVmData->pDriverData = pThis;
             return VINF_SUCCESS;

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

@@ -27 +27 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
-# ifdef DEBUG_nike
+//# ifdef DEBUG_nike
 #  define VBOX_WITH_IOMMU
-# endif
+//# endif
 #endif
 
@@ -90 +90 @@
 
 /**
- * Per-VM data of the VBox PCI driver. Pointed to by pVM->rawpci.s.pOsData.
+ * Per-VM data of the VBox PCI driver. Pointed to by pGVM->rawpci.s.pDriverData.
  *
  */
@@ -100 +100 @@
 #ifdef RT_OS_LINUX
 # ifdef VBOX_WITH_IOMMU
+    /* IOMMU domain. */
     struct iommu_domain* pIommuDomain;
 # endif
 #endif
-    int32_t        fFlags;
+    /* Back pointer to pGVM->rawpci.s. */
+    PRAWPCIPERVM pPerVmData;
 } VBOXRAWPCIDRVVM;