Changeset 57376 in vbox

Timestamp:

Aug 17, 2015 11:42:19 AM (9 years ago)

Author:

vboxsync

Message:

VMR3SetError[V]: Take shortcut when called on EMT, allowing it early during VM creation. Don't require a VM structure to be present, just the UVM.

File:

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

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

@@ -3832 +3832 @@
  * @thread  Any thread.
  */
-static int vmR3SetErrorU(PUVM pUVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...)
+static int vmR3SetErrorU(PUVM pUVM, int rc, RT_SRC_POS_DECL, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(6, 7)
 {
     va_list va;
@@ -3939 +3939 @@
 {
     UVM_ASSERT_VALID_EXT_RETURN(pUVM, VERR_INVALID_VM_HANDLE);
+
+    /* Take shortcut when called on EMT, skipping VM handle requirement + validation. */
+    if (VMR3GetVMCPUThread(pUVM) != NIL_RTTHREAD)
+    {
+        vmR3SetErrorUV(pUVM, rc, RT_SRC_POS_ARGS, pszFormat, &va);
+        return rc;
+    }
+
     VM_ASSERT_VALID_EXT_RETURN(pUVM->pVM, VERR_INVALID_VM_HANDLE);
     return VMSetErrorV(pUVM->pVM, rc, pszFile, iLine, pszFunction, pszFormat, va);