Changeset 36441 in vbox for trunk/include/VBox

Timestamp:

Mar 25, 2011 9:11:56 PM (14 years ago)

Author:

vboxsync

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

70806

Message:

VMM: Sketched out where to do the initial I/O MMU setup. This adds a VMINITCOMPLETED_HWACCM and makes HWACCMR3InitFinalizeR0 private (invoked from HWACCMR3InitCompleted(,_RING0).

Location:

trunk/include/VBox

Files:

• rawpci.h (modified) (3 diffs)
• vmm/hwaccm.h (modified) (1 diff)
• vmm/pgm.h (modified) (2 diffs)
• vmm/vmapi.h (modified) (1 diff)
• vmm/vmm.h (modified) (1 diff)

trunk/include/VBox/rawpci.h

@@ -1 +1 @@
 /** @file
- * PDM - Pluggable Device Manager, raw PCI Devices. (VMM)
+ * Raw PCI Devices (aka PCI pass-through). (VMM)
  */
 
@@ -42 +42 @@
 typedef enum PCIRAWMEMINFOACTION
 {
-    /* Pages mapped. */
+    /** Pages mapped. */
     PCIRAW_MEMINFO_MAP,
-    /* Pages unmapped. */
+    /** Pages unmapped. */
     PCIRAW_MEMINFO_UNMAP,
     /** The usual 32-bit type blow up. */
@@ -75 +75 @@
 typedef struct RAWPCIVM
 {
-    /* Shall only be interpreted by the host PCI driver. */
+    /** Shall only be interpreted by the host PCI driver. */
     RTR0PTR                     pDriverData;
-    /* Callback called when mapping of host pages to the guest changes. */
+    /** Callback called when mapping of host pages to the guest changes. */
     PFNRAWPCICONTIGPHYSMEMINFO  pfnContigMemInfo;
 } RAWPCIVM;

trunk/include/VBox/vmm/hwaccm.h

@@ -115 +115 @@
 VMMR3DECL(int)          HWACCMR3Init(PVM pVM);
 VMMR3_INT_DECL(int)     HWACCMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
-VMMR3DECL(int)          HWACCMR3InitFinalizeR0(PVM pVM);
 VMMR3DECL(void)         HWACCMR3Relocate(PVM pVM);
 VMMR3DECL(int)          HWACCMR3Term(PVM pVM);

trunk/include/VBox/vmm/pgm.h

@@ -424 +424 @@
 VMMR0DECL(int)      PGMR0PhysAllocateHandyPages(PVM pVM, PVMCPU pVCpu);
 VMMR0DECL(int)      PGMR0PhysAllocateLargeHandyPage(PVM pVM, PVMCPU pVCpu);
+VMMR0_INT_DECL(int) PGMR0PhysSetupIommu(PVM pVM);
 VMMR0DECL(int)      PGMR0SharedModuleCheck(PVM pVM, PGVM pGVM, VMCPUID idCpu, PGMMSHAREDMODULE pModule, uint32_t cRegions, PGMMSHAREDREGIONDESC pRegions);
 VMMR0DECL(int)      PGMR0Trap0eHandlerNestedPaging(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
@@ -449 +450 @@
 VMMR3DECL(int)      PGMR3InitDynMap(PVM pVM);
 VMMR3DECL(int)      PGMR3InitFinalize(PVM pVM);
+VMMR3DECL(int)      PGMR3InitCompleted(PVM pVM, VMINITCOMPLETED enmWhat);
 VMMR3DECL(void)     PGMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3DECL(void)     PGMR3ResetUnpluggedCpu(PVM pVM, PVMCPU pVCpu);

trunk/include/VBox/vmm/vmapi.h

@@ -302 +302 @@
 typedef enum VMINITCOMPLETED
 {
-    /** The Ring3 init is completed. */
+    /** The ring-3 init is completed. */
     VMINITCOMPLETED_RING3 = 1,
-    /** The Ring0 init is completed. */
+    /** The ring-0 init is completed. */
     VMINITCOMPLETED_RING0,
+    /** The hardware accelerated virtualization init is completed.
+     * Used to make decisision depending on whether HWACCMIsEnabled(). */
+    VMINITCOMPLETED_HWACCM,
     /** The GC init is completed. */
     VMINITCOMPLETED_GC

trunk/include/VBox/vmm/vmm.h

@@ -365 +365 @@
     /** Call PGMR0AllocateLargePage(). */
     VMMR0_DO_PGM_ALLOCATE_LARGE_HANDY_PAGE,
+    /** Call PGMR0PhysSetupIommu(). */
+    VMMR0_DO_PGM_PHYS_SETUP_IOMMU,
 
     /** Call GMMR0InitialReservation(). */