Changeset 44386 in vbox

Timestamp:

Jan 25, 2013 6:18:12 PM (12 years ago)

Author:

vboxsync

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

83357

Message:

CFGM: Some smaller PVM/PUVM adjustments.

Location:

trunk

Files:

• include/VBox/vmm/cfgm.h (modified) (2 diffs)
• src/VBox/VMM/VMMR3/CFGM.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR3/PDMUsb.cpp (modified) (1 diff)

trunk/include/VBox/vmm/cfgm.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
@@ -84 +84 @@
 VMMR3DECL(int)          CFGMR3Init(PVM pVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUser);
 VMMR3DECL(int)          CFGMR3Term(PVM pVM);
-
-
-VMMR3DECL(PCFGMNODE)    CFGMR3CreateTree(PVM pVM);
 VMMR3DECL(int)          CFGMR3ConstructDefaultTree(PVM pVM);
+
+VMMR3DECL(PCFGMNODE)    CFGMR3CreateTree(PUVM pUVM);
 VMMR3DECL(void)         CFGMR3Dump(PCFGMNODE pRoot);
 VMMR3DECL(int)          CFGMR3DuplicateSubTree(PCFGMNODE pRoot, PCFGMNODE *ppCopy);

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

@@ -94 +94 @@
  * @param   pvUser              The user argument passed to pfnCFGMConstructor.
  * @thread  EMT.
+ * @internal
  */
 VMMR3DECL(int) CFGMR3Init(PVM pVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUser)
@@ -144 +145 @@
  * @returns VBox status code.
  * @param   pVM             Pointer to the VM.
+ * @internal
  */
 VMMR3DECL(int) CFGMR3Term(PVM pVM)
@@ -838 +840 @@
  * @returns VBox status code.
  * @param   pVM     Pointer to the VM.
+ * @internal
  */
 VMMR3DECL(int) CFGMR3ConstructDefaultTree(PVM pVM)
@@ -1197 +1200 @@
  * correct location.
  *
- * @returns Pointer to the root node.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3DECL(PCFGMNODE) CFGMR3CreateTree(PVM pVM)
-{
-    PCFGMNODE pNew = (PCFGMNODE)MMR3HeapAlloc(pVM, MM_TAG_CFGM, sizeof(*pNew));
+ * @returns Pointer to the root node, NULL on error (out of memory or invalid
+ *          VM handle).
+ * @param   pUVM            The user mode VM handle.
+ */
+VMMR3DECL(PCFGMNODE) CFGMR3CreateTree(PUVM pUVM)
+{
+    UVM_ASSERT_VALID_EXT_RETURN(pUVM, NULL);
+    VM_ASSERT_VALID_EXT_RETURN(pUVM->pVM, NULL);
+
+    PCFGMNODE pNew = (PCFGMNODE)MMR3HeapAllocU(pUVM, MM_TAG_CFGM, sizeof(*pNew));
     if (pNew)
     {
@@ -1210 +1217 @@
         pNew->pFirstChild   = NULL;
         pNew->pFirstLeaf    = NULL;
-        pNew->pVM           = pVM;
+        pNew->pVM           = pUVM->pVM;
         pNew->fRestrictedRoot = false;
         pNew->cchName       = 0;
@@ -1234 +1241 @@
      * Create a new tree.
      */
-    PCFGMNODE pNewRoot = CFGMR3CreateTree(pRoot->pVM);
+    PCFGMNODE pNewRoot = CFGMR3CreateTree(pRoot->pVM->pUVM);
     if (!pNewRoot)
         return VERR_NO_MEMORY;

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

@@ -898 +898 @@
      * Create the CFGM configuration node.
      */
-    PCFGMNODE pConfig = CFGMR3CreateTree(pVM);
+    PCFGMNODE pConfig = CFGMR3CreateTree(pUVM);
     AssertReturn(pConfig, VERR_NO_MEMORY);
     do /* break loop */