Changeset 51560 in vbox for trunk/include/VBox/vmm

Timestamp:

Jun 6, 2014 5:17:02 AM (11 years ago)

Author:

vboxsync

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

94218

Message:

VMM/GIM: Mapping of GIM MMIO2 regions and Hyper-V provider work.

Location:

trunk/include/VBox/vmm

Files:

• gim.h (modified) (5 diffs)
• hm.h (modified) (2 diffs)
• vm.h (modified) (3 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vmm/gim.h

@@ -44 +44 @@
 
 /**
- * Providers identifiers.
+ * GIM Provider Identifiers.
  */
 typedef enum GIMPROVIDERID
@@ -55 +55 @@
     GIMPROVIDERID_HYPERV,
     /** Linux KVM Interface. */
-    GIMPROVIDERID_KVM,
-    /** Ensure 32-bit type. */
-    GIMPROVIDERID_32BIT_HACK = 0x7fffffff
+    GIMPROVIDERID_KVM
 } GIMPROVIDERID;
+AssertCompileSize(GIMPROVIDERID, 4);
+
+
+/**
+ * A GIM MMIO2 region record.
+ */
+typedef struct GIMMMIO2REGION
+{
+    /** The region index. */
+    uint8_t             iRegion;
+    /** Whether an RC mapping is required. */
+    bool                fRCMapping;
+    /** Whether this region has been registered. */
+    bool                fRegistered;
+    /** Whether this region is currently mapped. */
+    bool                fMapped;
+    /** Alignment padding. */
+    uint8_t             au8Alignment0[4];
+    /** Size of the region (must be page aligned). */
+    uint32_t            cbRegion;
+    /** Alignment padding. */
+    uint32_t            u32Alignment0;
+    /** The host ring-0 address of the first page in the region. */
+    R0PTRTYPE(void *)   pvPageR0;
+    /** The host ring-3 address of the first page in the region. */
+    R3PTRTYPE(void *)   pvPageR3;
+    /** The ring-context address of the first page in the region. */
+    RCPTRTYPE(void *)   pvPageRC;
+    /** The guest-physical address of the first page in the region. */
+    RTGCPHYS            GCPhysPage;
+    /** The description of the region. */
+    char                szDescription[32];
+} GIMMMIO2REGION;
+/** Pointer to a GIM MMIO2 region. */
+typedef GIMMMIO2REGION *PGIMMMIO2REGION;
+/** Pointer to a const GIM MMIO2 region. */
+typedef GIMMMIO2REGION const *PCGIMMMIO2REGION;
+AssertCompileMemberAlignment(GIMMMIO2REGION, cbRegion,   8);
+AssertCompileMemberAlignment(GIMMMIO2REGION, pvPageR0,   8);
 
 
@@ -114 +151 @@
  * @{
  */
-
+VMMR0_INT_DECL(int)         GIMR0InitVM(PVM pVM);
+VMMR0_INT_DECL(int)         GIMR0TermVM(PVM pVM);
 /** @} */
 #endif /* IN_RING0 */
@@ -124 +162 @@
  * @{
  */
-VMMR3_INT_DECL(int)     GIMR3Init(PVM pVM);
-VMMR3_INT_DECL(int)     GIMR3Term(PVM pVM);
+VMMR3_INT_DECL(int)         GIMR3Init(PVM pVM);
+VMMR3_INT_DECL(int)         GIMR3Term(PVM pVM);
+VMMR3_INT_DECL(void)        GIMR3Reset(PVM pVM);
+VMMR3DECL(void)             GIMR3GimDeviceRegister(PVM pVM, PPDMDEVINS pDevIns);
+VMMR3DECL(PGIMMMIO2REGION)  GIMR3GetMmio2Regions(PVM pVM, uint32_t *pcRegions);
 /** @} */
 #endif /* IN_RING3 */
 
-VMMDECL(bool)           GIMIsEnabled(PVM pVM);
-VMM_INT_DECL(int)       GIMHypercall(PVMCPU pVCpu, PCPUMCTX pCtx);
-VMM_INT_DECL(int)       GIMReadMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue);
-VMM_INT_DECL(int)       GIMWriteMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue);
+VMMDECL(bool)               GIMIsEnabled(PVM pVM);
+VMMDECL(int)                GIMUpdateParavirtTsc(PVM pVM, uint64_t u64Offset);
+VMM_INT_DECL(int)           GIMHypercall(PVMCPU pVCpu, PCPUMCTX pCtx);
+VMM_INT_DECL(int)           GIMReadMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t *puValue);
+VMM_INT_DECL(int)           GIMWriteMsr(PVMCPU pVCpu, uint32_t idMsr, PCCPUMMSRRANGE pRange, uint64_t uValue, uint64_t uRawValue);
 
 /** @} */
@@ -138 +180 @@
 RT_C_DECLS_END
 
-#endif
+#endif  /* ___VBox_vmm_gim_h */
 

trunk/include/VBox/vmm/hm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -144 +144 @@
 VMM_INT_DECL(int)               HMAmdIsSubjectToErratum170(uint32_t *pu32Family, uint32_t *pu32Model, uint32_t *pu32Stepping);
 VMM_INT_DECL(bool)              HMSetSingleInstruction(PVMCPU pVCpu, bool fEnable);
+VMM_INT_DECL(int)               HMPatchHypercall(PVM pVM, void *pvBuf, size_t cbBuf, size_t *pcbWritten);
 
 #ifndef IN_RC

trunk/include/VBox/vmm/vm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -1122 +1122 @@
         struct GIM s;
 #endif
-        uint8_t     padding[64];        /* multiple of 64 */
+        uint8_t     padding[256];        /* multiple of 64 */
     } gim;
 
@@ -1147 +1147 @@
 
     /** Padding for aligning the cpu array on a page boundary. */
-    uint8_t         abAlignment2[350];
+    uint8_t         abAlignment2[158];
 
     /* ---- end small stuff ---- */

trunk/include/VBox/vmm/vm.mac

@@ -4 +4 @@
 
 ;
-; Copyright (C) 2006-2013 Oracle Corporation
+; Copyright (C) 2006-2014 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as