Changeset 44394 in vbox for trunk

Timestamp:

Jan 26, 2013 5:53:53 PM (12 years ago)

Author:

vboxsync

Message:

+VMMR3GetCpuByIdU, -FNATOMICHANDLER

Location:

trunk

Files:

• include/VBox/vmm/vmm.h (modified) (4 diffs)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (8 diffs)
• src/VBox/VMM/VMMR3/VMM.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/vmm.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -113 +113 @@
 
 /**
- * VMMR3AtomicExecuteHandler callback function.
- *
- * @returns VBox status code.
- * @param   pVM     Pointer to the shared VM structure.
- * @param   pvUser  User specified argument
- *
- * @todo missing prefix.
- */
-typedef DECLCALLBACK(int) FNATOMICHANDLER(PVM pVM, void *pvUser);
-/** Pointer to a FNMMATOMICHANDLER(). */
-typedef FNATOMICHANDLER *PFNATOMICHANDLER;
-
-/**
  * Rendezvous callback.
  *
@@ -224 +211 @@
 
 
-VMMDECL(RTRCPTR)     VMMGetStackRC(PVMCPU pVCpu);
-VMMDECL(VMCPUID)     VMMGetCpuId(PVM pVM);
-VMMDECL(PVMCPU)      VMMGetCpu(PVM pVM);
-VMMDECL(PVMCPU)      VMMGetCpu0(PVM pVM);
-VMMDECL(PVMCPU)      VMMGetCpuById(PVM pVM, VMCPUID idCpu);
-VMMDECL(uint32_t)    VMMGetSvnRev(void);
-VMMDECL(VMMSWITCHER) VMMGetSwitcher(PVM pVM);
-VMMDECL(void)        VMMTrashVolatileXMMRegs(void);
+VMM_INT_DECL(RTRCPTR)       VMMGetStackRC(PVMCPU pVCpu);
+VMMDECL(VMCPUID)            VMMGetCpuId(PVM pVM);
+VMMDECL(PVMCPU)             VMMGetCpu(PVM pVM);
+VMMDECL(PVMCPU)             VMMGetCpu0(PVM pVM);
+VMMDECL(PVMCPU)             VMMGetCpuById(PVM pVM, VMCPUID idCpu);
+VMMR3DECL(PVMCPU)           VMMR3GetCpuByIdU(PUVM pVM, VMCPUID idCpu);
+VMM_INT_DECL(uint32_t)      VMMGetSvnRev(void);
+VMM_INT_DECL(VMMSWITCHER)   VMMGetSwitcher(PVM pVM);
+VMM_INT_DECL(void)          VMMTrashVolatileXMMRegs(void);
 
 /** @def VMMIsHwVirtExtForced
@@ -241 +229 @@
  * @returns true / false.
  * @param   pVM     Pointer to the shared VM structure.
+ * @internal
  */
 #define VMMIsHwVirtExtForced(pVM)   ((pVM)->fHwVirtExtForced)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -174 +174 @@
  * @param   pVCpu       Pointer to the VMCPU.
  */
-VMMDECL(RTRCPTR) VMMGetStackRC(PVMCPU pVCpu)
+VMM_INT_DECL(RTRCPTR) VMMGetStackRC(PVMCPU pVCpu)
 {
     return (RTRCPTR)pVCpu->vmm.s.pbEMTStackBottomRC;
@@ -186 +186 @@
  *
  * @param   pVM         Pointer to the VM.
+ * @internal
  */
 VMMDECL(VMCPUID) VMMGetCpuId(PVM pVM)
@@ -237 +238 @@
  *
  * @param   pVM         Pointer to the VM.
+ * @internal
  */
 VMMDECL(PVMCPU) VMMGetCpu(PVM pVM)
@@ -291 +293 @@
  * @returns The VMCPU pointer.
  * @param   pVM         Pointer to the VM.
+ * @internal
  */
 VMMDECL(PVMCPU) VMMGetCpu0(PVM pVM)
@@ -306 +309 @@
  * @param   pVM         Pointer to the VM.
  * @param   idCpu       The ID of the virtual CPU.
+ * @internal
  */
 VMMDECL(PVMCPU) VMMGetCpuById(PVM pVM, RTCPUID idCpu)
@@ -322 +326 @@
  * @returns VBOX_SVN_REV.
  */
-VMMDECL(uint32_t) VMMGetSvnRev(void)
+VMM_INT_DECL(uint32_t) VMMGetSvnRev(void)
 {
     return VBOX_SVN_REV;
@@ -334 +338 @@
  * @param   pVM             Pointer to the VM.
  */
-VMMDECL(VMMSWITCHER) VMMGetSwitcher(PVM pVM)
+VMM_INT_DECL(VMMSWITCHER) VMMGetSwitcher(PVM pVM)
 {
     return pVM->vmm.s.enmSwitcher;

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -96 +96 @@
 #endif
 #include <VBox/vmm/ssm.h>
+#include <VBox/vmm/ftm.h>
 #include <VBox/vmm/tm.h>
 #include "VMMInternal.h"
 #include "VMMSwitcher.h"
 #include <VBox/vmm/vm.h>
-#include <VBox/vmm/ftm.h>
+#include <VBox/vmm/uvm.h>
 
 #include <VBox/err.h>
@@ -961 +962 @@
 
 /**
+ * Returns the VMCPU of the specified virtual CPU.
+ *
+ * @returns The VMCPU pointer. NULL if @a idCpu or @a pUVM is invalid.
+ *
+ * @param   pUVM        The user mode VM handle.
+ * @param   idCpu       The ID of the virtual CPU.
+ */
+VMMR3DECL(PVMCPU) VMMR3GetCpuByIdU(PUVM pUVM, RTCPUID idCpu)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, NULL);
+    AssertReturn(idCpu < pUVM->cCpus, NULL);
+    VM_ASSERT_VALID_EXT_RETURN(pUVM->pVM, NULL);
+    return &pUVM->pVM->aCpus[idCpu];
+}
+
+
+/**
  * Gets the pointer to a buffer containing the R0/RC RTAssertMsg2Weak output.
  *