Changeset 38229 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 28, 2011 5:41:41 PM (14 years ago)

Author:

vboxsync

Message:

VMMR3/VM.cpp: Make UUID an optional parameter. Unbreaks VBoxBFE.

File:

• trunk/src/VBox/VMM/VMMR3/VM.cpp (modified) (2 diffs)

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

@@ -690 +690 @@
             {
                 rc = CFGMR3QueryStringAllocDef(pRoot, "Name", &pUVM->vm.s.pszName, "<unknown>");
-                AssertLogRelMsg(RT_SUCCESS(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND, ("Configuration error: Querying \"Name\" failed, rc=%Rrc\n", rc));
+                AssertLogRelMsg(RT_SUCCESS(rc), ("Configuration error: Querying \"Name\" failed, rc=%Rrc\n", rc));
             }
 
@@ -696 +696 @@
             {
                 rc = CFGMR3QueryBytes(pRoot, "UUID", &pUVM->vm.s.Uuid, sizeof(pUVM->vm.s.Uuid));
-                AssertLogRelMsg(RT_SUCCESS(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND, ("Configuration error: Querying \"UUID\" failed, rc=%Rrc\n", rc));
+                if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+                    rc = VINF_SUCCESS;
+                AssertLogRelMsg(RT_SUCCESS(rc), ("Configuration error: Querying \"UUID\" failed, rc=%Rrc\n", rc));
             }