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

Timestamp:

Nov 21, 2012 3:36:39 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: Camel case.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (7 diffs)
• vmm.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1535 +1535 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-DECLASM(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val);
+DECLASM(int) VMXWriteVmcs32(uint32_t idxField, uint32_t u32Val);
 #else
-DECLINLINE(int) VMXWriteVMCS32(uint32_t idxField, uint32_t u32Val)
+DECLINLINE(int) VMXWriteVmcs32(uint32_t idxField, uint32_t u32Val)
 {
     int rc = VINF_SUCCESS;
@@ -1587 +1587 @@
  */
 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-DECLASM(int) VMXWriteVMCS64(uint32_t idxField, uint64_t u64Val);
+DECLASM(int) VMXWriteVmcs64(uint32_t idxField, uint64_t u64Val);
 #else
-VMMR0DECL(int) VMXWriteVMCS64Ex(PVMCPU pVCpu, uint32_t idxField, uint64_t u64Val);
-
-#define VMXWriteVMCS64(idxField, u64Val)    VMXWriteVMCS64Ex(pVCpu, idxField, u64Val)
+VMMR0DECL(int) VMXWriteVmcs64Ex(PVMCPU pVCpu, uint32_t idxField, uint64_t u64Val);
+
+#define VMXWriteVmcs64(idxField, u64Val)    VMXWriteVmcs64Ex(pVCpu, idxField, u64Val)
 #endif
 
 #if HC_ARCH_BITS == 64
-#define VMXWriteVMCS VMXWriteVMCS64
+#define VMXWriteVmcs VMXWriteVmcs64
 #else
-#define VMXWriteVMCS VMXWriteVMCS32
+#define VMXWriteVmcs VMXWriteVmcs32
 #endif /* HC_ARCH_BITS == 64 */
 
@@ -1625 +1625 @@
  */
 #if RT_INLINE_ASM_EXTERNAL || HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-DECLASM(int) VMXReadVMCS32(uint32_t idxField, uint32_t *pData);
+DECLASM(int) VMXReadVmcs32(uint32_t idxField, uint32_t *pData);
 #else
-DECLINLINE(int) VMXReadVMCS32(uint32_t idxField, uint32_t *pData)
+DECLINLINE(int) VMXReadVmcsS32(uint32_t idxField, uint32_t *pData)
 {
     int rc = VINF_SUCCESS;
@@ -1680 +1680 @@
  */
 #if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-DECLASM(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData);
+DECLASM(int) VMXReadVmcs64(uint32_t idxField, uint64_t *pData);
 #else
-DECLINLINE(int) VMXReadVMCS64(uint32_t idxField, uint64_t *pData)
+DECLINLINE(int) VMXReadVmcs64(uint32_t idxField, uint64_t *pData)
 {
     int rc;
 
     uint32_t val_hi, val;
-    rc  = VMXReadVMCS32(idxField, &val);
-    rc |= VMXReadVMCS32(idxField + 1, &val_hi);
+    rc  = VMXReadVmcs32(idxField, &val);
+    rc |= VMXReadVmcs32(idxField + 1, &val_hi);
     AssertRC(rc);
     *pData = RT_MAKE_U64(val, val_hi);
@@ -1696 +1696 @@
 
 #if HC_ARCH_BITS == 64
-# define VMXReadVMCS VMXReadVMCS64
+# define VMXReadVmcs VMXReadVmcs64
 #else
-# define VMXReadVMCS VMXReadVMCS32
+# define VMXReadVmcs VMXReadVmcs32
 #endif /* HC_ARCH_BITS == 64 */
 
@@ -1710 +1710 @@
 #if HC_ARCH_BITS == 64
     uint64_t uLastError = 0;
-    int rc = VMXReadVMCS(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
+    int rc = VMXReadVmcs(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
     AssertRC(rc);
     return (uint32_t)uLastError;
@@ -1716 +1716 @@
 #else /* 32-bit host: */
     uint32_t uLastError = 0;
-    int rc = VMXReadVMCS32(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
+    int rc = VMXReadVmcs32(VMX_VMCS32_RO_VM_INSTR_ERROR, &uLastError);
     AssertRC(rc);
     return uLastError;

trunk/include/VBox/vmm/vmm.h

@@ -484 +484 @@
 VMMR0DECL(void)     VMMR0LogFlushDisable(PVMCPU pVCpu);
 VMMR0DECL(void)     VMMR0LogFlushEnable(PVMCPU pVCpu);
+VMMR0DECL(bool)     VMMR0IsLogFlushDisabled(PVMCPU pVCpu);
 #else
 #define             VMMR0LogFlushDisable(pVCpu)     do { } while(0)
 #define             VMMR0LogFlushEnable(pVCpu)      do { } while(0)
+#define             VMMR0IsLogFlushDisabled(pVCpu)  (true)
 #endif