Changeset 44373 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 25, 2013 12:19:29 PM (12 years ago)

Author:

vboxsync

Message:

HM,++: pVM -> pUVM for main, mark as many as possible interfaces module internal.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CSAM.cpp (modified) (3 diffs)
• DBGF.cpp (modified) (2 diffs)
• EM.cpp (modified) (2 diffs)
• HM.cpp (modified) (23 diffs)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -36 +36 @@
 #include <VBox/vmm/trpm.h>
 #include <VBox/vmm/cfgm.h>
+#include <VBox/vmm/ssm.h>
 #include <VBox/param.h>
 #include <iprt/avl.h>
@@ -42 +43 @@
 #include "CSAMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/dbg.h>
 #include <VBox/err.h>
-#include <VBox/vmm/ssm.h>
 #include <VBox/log.h>
 #include <iprt/assert.h>
@@ -2685 +2686 @@
  * Query CSAM state (enabled/disabled)
  *
- * @returns 0 - disabled, 1 - enabled
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(int) CSAMR3IsEnabled(PVM pVM)
-{
-    return pVM->fCSAMEnabled;
+ * @returns true if enabled, false otherwise.
+ * @param   pUVM        The user mode VM handle.
+ */
+VMMR3DECL(bool) CSAMR3IsEnabled(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    return CSAMIsEnabled(pVM);
 }
 

trunk/src/VBox/VMM/VMMR3/DBGF.cpp

@@ -80 +80 @@
 #include "DBGFInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/err.h>
 
@@ -1116 +1117 @@
 }
 
+
+/**
+ * Inject an NMI into a running VM (only VCPU 0!)
+ *
+ * @returns VBox status code.
+ * @param   pVM         Pointer to the VM.
+ */
+VMMR3DECL(int) DBGFR3InjectNMI(PUVM pUVM, VMCPUID idCpu)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(idCpu < pVM->cCpus, VERR_INVALID_CPU_ID);
+
+    /** @todo Implement generic NMI injection. */
+    if (!HMIsEnabled(pVM))
+        return VERR_NOT_SUP_IN_RAW_MODE;
+
+    VMCPU_FF_SET(&pVM->aCpus[idCpu], VMCPU_FF_INTERRUPT_NMI);
+    return VINF_SUCCESS;
+}
+

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -63 +63 @@
 #include "EMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/vmm/cpumdis.h>
 #include <VBox/dis.h>
@@ -666 +667 @@
 
 /**
+ * Checks if raw ring-3 execute mode is enabled.
+ *
+ * @returns true if enabled, false if disabled.
+ * @param   pUVM            The user mode VM handle.
+ */
+VMMR3DECL(bool) EMR3IsRawRing3Enabled(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    return EMIsRawRing3Enabled(pVM);
+}
+
+
+/**
+ * Checks if raw ring-0 execute mode is enabled.
+ *
+ * @returns true if enabled, false if disabled.
+ * @param   pUVM            The user mode VM handle.
+ */
+VMMR3DECL(bool) EMR3IsRawRing0Enabled(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    return EMIsRawRing0Enabled(pVM);
+}
+
+
+/**
  * Raise a fatal error.
  *

trunk/src/VBox/VMM/VMMR3/HM.cpp

@@ -39 +39 @@
 #include "HMInternal.h"
 #include <VBox/vmm/vm.h>
+#include <VBox/vmm/uvm.h>
 #include <VBox/err.h>
 #include <VBox/param.h>
@@ -284 +285 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(int) HMR3Init(PVM pVM)
+VMMR3_INT_DECL(int) HMR3Init(PVM pVM)
 {
     LogFlow(("HMR3Init\n"));
@@ -1484 +1485 @@
  * @param   pVM     The VM.
  */
-VMMR3DECL(void) HMR3Relocate(PVM pVM)
+VMMR3_INT_DECL(void) HMR3Relocate(PVM pVM)
 {
     Log(("HMR3Relocate to %RGv\n", MMHyperGetArea(pVM, 0)));
@@ -1547 +1548 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(bool) HMR3IsAllowed(PVM pVM)
+VMMR3_INT_DECL(bool) HMR3IsAllowed(PVM pVM)
 {
     return pVM->hm.s.fAllowed;
@@ -1564 +1565 @@
  * @param   enmGuestMode   New guest paging mode.
  */
-VMMR3DECL(void) HMR3PagingModeChanged(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
+VMMR3_INT_DECL(void) HMR3PagingModeChanged(PVM pVM, PVMCPU pVCpu, PGMMODE enmShadowMode, PGMMODE enmGuestMode)
 {
     /* Ignore page mode changes during state loading. */
@@ -1619 +1620 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(int) HMR3Term(PVM pVM)
+VMMR3_INT_DECL(int) HMR3Term(PVM pVM)
 {
     if (pVM->hm.s.vmx.pRealModeTSS)
@@ -1675 +1676 @@
  * @param   pVCpu   The CPU to reset.
  */
-VMMR3DECL(void) HMR3ResetCpu(PVMCPU pVCpu)
+VMMR3_INT_DECL(void) HMR3ResetCpu(PVMCPU pVCpu)
 {
     /* On first entry we'll sync everything. */
@@ -1712 +1713 @@
  * @param   pVM     Pointer to the VM.
  */
-VMMR3DECL(void) HMR3Reset(PVM pVM)
+VMMR3_INT_DECL(void) HMR3Reset(PVM pVM)
 {
     LogFlow(("HMR3Reset:\n"));
@@ -1831 +1832 @@
  * @param   cbPatchMem  Size of the memory range.
  */
-VMMR3DECL(int)  HMR3EnablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
+VMMR3_INT_DECL(int)  HMR3EnablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
 {
     VM_ASSERT_EMT(pVM);
@@ -1855 +1856 @@
  * @param   cbPatchMem  Size of the memory range.
  */
-VMMR3DECL(int)  HMR3DisablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
+VMMR3_INT_DECL(int)  HMR3DisablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
 {
     Log(("HMR3DisablePatching %RGv size %x\n", pPatchMem, cbPatchMem));
@@ -2289 +2290 @@
  * @param   pCtx        Pointer to the guest CPU context.
  */
-VMMR3DECL(int) HMR3PatchTprInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+VMMR3_INT_DECL(int) HMR3PatchTprInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     NOREF(pCtx);
@@ -2307 +2308 @@
  * @param   pCtx        Partial VM execution context.
  */
-VMMR3DECL(int) HMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx)
+VMMR3_INT_DECL(int) HMR3EmulateIoBlock(PVM pVM, PCPUMCTX pCtx)
 {
     PVMCPU pVCpu = VMMGetCpu(pVM);
@@ -2523 +2524 @@
  * @param   pCtx        VM execution context.
  */
-VMMR3DECL(bool) HMR3IsRescheduleRequired(PVM pVM, PCPUMCTX pCtx)
+VMMR3_INT_DECL(bool) HMR3IsRescheduleRequired(PVM pVM, PCPUMCTX pCtx)
 {
     /*
@@ -2546 +2547 @@
  * @param   pVCpu       Pointer to the current VMCPU.
  */
-VMMR3DECL(void) HMR3NotifyScheduled(PVMCPU pVCpu)
+VMMR3_INT_DECL(void) HMR3NotifyScheduled(PVMCPU pVCpu)
 {
     pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
@@ -2557 +2558 @@
  * @param   pVCpu       Pointer to the VMCPU.
  */
-VMMR3DECL(void) HMR3NotifyEmulated(PVMCPU pVCpu)
+VMMR3_INT_DECL(void) HMR3NotifyEmulated(PVMCPU pVCpu)
 {
     pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_ALL_GUEST;
@@ -2569 +2570 @@
  * @param   pVCpu        Pointer to the VMCPU.
  */
-VMMR3DECL(bool) HMR3IsActive(PVMCPU pVCpu)
+VMMR3_INT_DECL(bool) HMR3IsActive(PVMCPU pVCpu)
 {
     return pVCpu->hm.s.fActive;
@@ -2579 +2580 @@
  *
  * @returns true if nested paging is being used, otherwise false.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(bool) HMR3IsNestedPagingActive(PVM pVM)
-{
+ * @param   pUVM        The user mode VM handle.
+ */
+VMMR3DECL(bool) HMR3IsEnabled(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
+    return HMIsEnabled(pVM);
+}
+
+
+/**
+ * Checks if we are currently using nested paging.
+ *
+ * @returns true if nested paging is being used, otherwise false.
+ * @param   pUVM        The user mode VM handle.
+ */
+VMMR3DECL(bool) HMR3IsNestedPagingActive(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
     return pVM->hm.s.fNestedPaging;
 }
@@ -2591 +2610 @@
  *
  * @returns true if VPID is being used, otherwise false.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(bool) HMR3IsVPIDActive(PVM pVM)
-{
+ * @param   pUVM        The user mode VM handle.
+ */
+VMMR3DECL(bool) HMR3IsVpidActive(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, false);
+    PVM pVM = pUVM->pVM;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, false);
     return pVM->hm.s.vmx.fVpid;
 }
@@ -2605 +2627 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(bool) HMR3IsEventPending(PVMCPU pVCpu)
+VMMR3_INT_DECL(bool) HMR3IsEventPending(PVMCPU pVCpu)
 {
     return HMIsEnabled(pVCpu->pVMR3) && pVCpu->hm.s.Event.fPending;
@@ -2617 +2639 @@
  * @param   pVM         Pointer to the VM.
  */
-VMMR3DECL(bool) HMR3IsVmxPreemptionTimerUsed(PVM pVM)
+VMMR3_INT_DECL(bool) HMR3IsVmxPreemptionTimerUsed(PVM pVM)
 {
     return HMIsEnabled(pVM)
@@ -2639 +2661 @@
  * @param   pCtx        Pointer to the guest CPU context.
  */
-VMMR3DECL(VBOXSTRICTRC) HMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+VMMR3_INT_DECL(VBOXSTRICTRC) HMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     HMPENDINGIO enmType = pVCpu->hm.s.PendingIO.enmType;
@@ -2686 +2708 @@
 
 /**
- * Inject an NMI into a running VM (only VCPU 0!)
- *
- * @returns VBox status code.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(int)  HMR3InjectNMI(PVM pVM)
-{
-    VMCPU_FF_SET(&pVM->aCpus[0], VMCPU_FF_INTERRUPT_NMI);
-    return VINF_SUCCESS;
-}
-
-
-/**
  * Check fatal VT-x/AMD-V error and produce some meaningful
  * log release message.
@@ -2705 +2714 @@
  * @param   iStatusCode VBox status code.
  */
-VMMR3DECL(void) HMR3CheckError(PVM pVM, int iStatusCode)
+VMMR3_INT_DECL(void) HMR3CheckError(PVM pVM, int iStatusCode)
 {
     for (VMCPUID i = 0; i < pVM->cCpus; i++)