Changeset 36436 in vbox

Timestamp:

Mar 25, 2011 3:28:17 PM (14 years ago)

Author:

vboxsync

Message:

PCI: more IOMMU bits

Location:

trunk

Files:

• include/VBox/rawpci.h (modified) (3 diffs)
• src/VBox/HostDrivers/VBoxPci/VBoxPci.c (modified) (1 diff)

trunk/include/VBox/rawpci.h

@@ -50 +50 @@
 } PCIRAWMEMINFOACTION;
 
+/* Forward declaration. */
+struct RAWPCIVM;
+
 /**
  * Callback to notify raw PCI subsystem about mapping/unmapping of
@@ -55 +58 @@
  * RAM pages with IOMMU, so that it could allow DMA for PCI devices
  * directly from the guest RAM.
- * Region shall be one or more contigous (both host and guest) pages 
- * of physical memory.  
- * 
+ * Region shall be one or more contigous (both host and guest) pages
+ * of physical memory.
+ *
+ * @returns VBox status code.
+ *
  * @param   pVM           VM pointer.
- * @param   HostStart     Physical address of region start on the host.  
+ * @param   HostStart     Physical address of region start on the host.
  * @param   GuestStart    Physical address of region start on the guest.
  * @param   cMemSize      Region size in bytes.
- * @param   Action        Action performed.
-
- */
-typedef DECLCALLBACK(void) FNRAWPCICONTIGPHYSMEMINFO(PVM pVM, RTHCPHYS HostStart, RTGCPHYS GuestStart, uint64_t cMemSize, PCIRAWMEMINFOACTION Action);
+ * @param   Action        Action performed (i.e. if page was mapped or unmapped).
+ */
+typedef DECLCALLBACK(int) FNRAWPCICONTIGPHYSMEMINFO(struct RAWPCIVM* pVmData, RTHCPHYS HostStart, RTGCPHYS GuestStart, uint64_t cMemSize, PCIRAWMEMINFOACTION Action);
 typedef FNRAWPCICONTIGPHYSMEMINFO *PFNRAWPCICONTIGPHYSMEMINFO;
 
@@ -307 +311 @@
     PCIRAW_POWER_SUSPEND,
     /* Resume. */
-    PCIRAW_POWER_RESUME,  
+    PCIRAW_POWER_RESUME,
     /** The usual 32-bit type blow up. */
     PCIRAW_POWER_32BIT_HACK = 0x7fffffff

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

@@ -563 +563 @@
         PVBOXRAWPCIDRVVM pThis = (PVBOXRAWPCIDRVVM)pPciData->pDriverData;
 
+#ifdef VBOX_WITH_IOMMU
+        /* If we have IOMMU, need to unmap all guest's physical pages from IOMMU on VM termination. */
+#endif
+
         vboxPciOsDeinitVm(pThis, pVM);