Changeset 66281 in vbox for trunk/src/VBox

Timestamp:

Mar 28, 2017 7:29:08 AM (8 years ago)

Author:

vboxsync

Message:

VMM: Nested Hw.virt: Decls, naming.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMSVMAll.cpp (modified) (2 diffs)
• VMMR0/HMR0.cpp (modified) (3 diffs)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -458 +458 @@
             {
                 uint8_t   const uVector    = pEventInject->n.u8Vector;
-                TRPMEVENT const enmType    = HMSvmEventToTrpmEventType(pEventInject);
+                TRPMEVENT const enmType    = hmSvmEventToTrpmEventType(pEventInject);
                 uint16_t  const uErrorCode = pEventInject->n.u1ErrorCodeValid ? pEventInject->n.u32ErrorCode : 0;
 
@@ -681 +681 @@
  * @param   pEvent       Pointer to the SVM event.
  */
-VMM_INT_DECL(TRPMEVENT) HMSvmEventToTrpmEventType(PCSVMEVENT pEvent)
+VMM_INT_DECL(TRPMEVENT) hmSvmEventToTrpmEventType(PCSVMEVENT pEvent)
 {
     uint8_t const uType = pEvent->n.u3Type;

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -1614 +1614 @@
  * @returns The cpu structure pointer.
  */
-VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void)
+VMMR0_INT_DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void)
 {
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
@@ -1752 +1752 @@
  * @param   pszMsg   Message to prepend the log entry with.
  */
-VMMR0DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg)
+VMMR0_INT_DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg)
 {
     /*
@@ -1875 +1875 @@
  * @param   pCtx        Pointer to the CPU context.
  */
-VMMR0DECL(void) hmDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+VMMR0_INT_DECL(void) hmR0DumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     NOREF(pVM);

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -2456 +2456 @@
     uint8_t   uVector     = Event.n.u8Vector;
     uint8_t   uVectorType = Event.n.u3Type;
-    TRPMEVENT enmTrapType = HMSvmEventToTrpmEventType(&Event);
+    TRPMEVENT enmTrapType = hmSvmEventToTrpmEventType(&Event);
 
     Log4(("HM event->TRPM: uVector=%#x enmTrapType=%d\n", uVector, uVectorType));
@@ -2743 +2743 @@
     if (rcVMRun == VERR_SVM_INVALID_GUEST_STATE)
     {
-        hmDumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
+        hmR0DumpRegs(pVM, pVCpu, pCtx); NOREF(pVM);
 #ifdef VBOX_STRICT
         Log4(("ctrl.u64VmcbCleanBits             %#RX64\n",   pVmcb->ctrl.u64VmcbCleanBits));

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -12014 +12014 @@
 #endif
 
-    hmDumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
+    hmR0DumpRegs(pVCpu->CTX_SUFF(pVM), pVCpu, pMixedCtx);
     return VERR_VMX_INVALID_GUEST_STATE;
 }

trunk/src/VBox/VMM/include/HMInternal.h

@@ -1102 +1102 @@
 AssertCompileMemberAlignment(HMCPU, Event, 8);
 
-VMM_INT_DECL(TRPMEVENT) HMSvmEventToTrpmEventType(PCSVMEVENT pSvmEvent);
+VMM_INT_DECL(TRPMEVENT) hmSvmEventToTrpmEventType(PCSVMEVENT pSvmEvent);
 
 #ifdef IN_RING0
-VMMR0DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void);
+VMMR0_INT_DECL(PHMGLOBALCPUINFO) hmR0GetCurrentCpu(void);
 
 # ifdef VBOX_STRICT
-VMMR0DECL(void) hmDumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
-VMMR0DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
+VMMR0_INT_DECL(void) hmR0DumpRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
+VMMR0_INT_DECL(void) hmR0DumpDescriptor(PCX86DESCHC pDesc, RTSEL Sel, const char *pszMsg);
 # else
-#  define hmDumpRegs(a, b ,c)            do { } while (0)
+#  define hmR0DumpRegs(a, b ,c)          do { } while (0)
 #  define hmR0DumpDescriptor(a, b, c)    do { } while (0)
 # endif /* VBOX_STRICT */