Changeset 46791 in vbox for trunk/src

Timestamp:

Jun 26, 2013 9:20:37 AM (12 years ago)

Author:

vboxsync

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

86724

Message:

Made CFGMR3RemoveNode work in standalone mode.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/CFGM.cpp (modified) (1 diff)
• testcase/tstCFGM.cpp (modified) (1 diff)

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

@@ -1940 +1940 @@
             if (pNode->pParent)
                 pNode->pParent->pFirstChild = pNode->pNext;
-            else if (pNode == pNode->pVM->cfgm.s.pRoot) /* might be a different tree */
+            else if (   pNode->pVM                         /* might be a different tree */
+                     && pNode == pNode->pVM->cfgm.s.pRoot)
                 pNode->pVM->cfgm.s.pRoot = NULL;
         }

trunk/src/VBox/VMM/testcase/tstCFGM.cpp

@@ -133 +133 @@
     RTTESTI_CHECK_RETV((pRoot = CFGMR3CreateTree(NULL)) != NULL);
     doGeneralTests(pRoot);
+    CFGMR3RemoveNode(pRoot);
 }