Changeset 36041 in vbox for trunk/include/VBox

Timestamp:

Feb 21, 2011 4:04:53 PM (14 years ago)

Author:

vboxsync

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

70151

Message:

Main/VMM: Use UVM w/ refcounting - part 1.

Location:

trunk/include/VBox/vmm

Files:

• uvm.h (modified) (1 diff)
• vmapi.h (modified) (3 diffs)

trunk/include/VBox/vmm/uvm.h

@@ -140 +140 @@
 
 /** @def UVM_ASSERT_VALID_EXT_RETURN
- * Asserts a the VM handle is valid for external access, i.e. not being
- * destroy or terminated.
+ * Asserts a user mode VM handle is valid for external access.
  */
-#define UVM_ASSERT_VALID_EXT_RETURN(pVM, rc) \
-        AssertMsgReturn(    RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) \
-                        &&  (pUVM)->u32Magic == UVM_MAGIC, \
-                        ("pUVM=%p u32Magic=%#x\n", (pUVM), \
-                         RT_VALID_ALIGNED_PTR(pVM, PAGE_SIZE) ? (pUVM)->u32Magic : 0), \
-                        (rc))
+#define UVM_ASSERT_VALID_EXT_RETURN(a_pUVM, a_rc) \
+        AssertMsgReturn(    RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) \
+                        &&  (a_pUVM)->u32Magic == UVM_MAGIC, \
+                        ("a_pUVM=%p u32Magic=%#x\n", (a_pUVM), \
+                         RT_VALID_ALIGNED_PTR(a_pUVM, PAGE_SIZE) ? (a_pUVM)->u32Magic : 0), \
+                        (a_rc))
 
 #endif

trunk/include/VBox/vmm/vmapi.h

@@ -344 +344 @@
 VMMR3DECL(PVM)  VMR3EnumVMs(PVM pVMPrev);
 
+VMMR3DECL(PVM)          VMR3GetVM(PUVM pUVM);
+VMMR3DECL(PUVM)         VMR3GetUVM(PVM pVM);
+VMMR3DECL(uint32_t)     VMR3RetainUVM(PUVM pUVM);
+VMMR3DECL(uint32_t)     VMR3ReleaseUVM(PUVM pUVM);
+VMMR3DECL(const char *) VMR3GetName(PUVM pUVM);
+VMMR3DECL(PRTUUID)      VMR3GetUuid(PUVM pUVM, PRTUUID pUuid);
+VMMR3DECL(VMSTATE)      VMR3GetState(PVM pVM);
+VMMR3DECL(VMSTATE)      VMR3GetStateU(PUVM pUVM);
+VMMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState);
+
 /**
  * VM destruction callback.
@@ -357 +367 @@
 VMMR3DECL(int)      VMR3AtStateRegister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser);
 VMMR3DECL(int)      VMR3AtStateDeregister(PVM pVM, PFNVMATSTATE pfnAtState, void *pvUser);
-VMMR3DECL(VMSTATE)  VMR3GetState(PVM pVM);
-VMMR3DECL(const char *) VMR3GetStateName(VMSTATE enmState);
 VMMR3DECL(bool)     VMR3TeleportedAndNotFullyResumedYet(PVM pVM);
 VMMR3DECL(int)      VMR3AtErrorRegister(PVM pVM, PFNVMATERROR pfnAtError, void *pvUser);
@@ -409 +417 @@
 VMMR3DECL(int)              VMR3HotUnplugCpu(PVM pVM, VMCPUID idCpu);
 VMMR3DECL(int)              VMR3HotPlugCpu(PVM pVM, VMCPUID idCpu);
-VMMR3DECL(int)              VMR3SetCpuExecutionCap(PVM pVM, unsigned ulExecutionCap);
+VMMR3DECL(int)              VMR3SetCpuExecutionCap(PVM pVM, uint32_t uCpuExecutionCap);
 /** @} */
 #endif /* IN_RING3 */