Changeset 47 in vbox for trunk/src/VBox/VMM

Timestamp:

Jan 15, 2007 6:29:09 PM (18 years ago)

Author:

vboxsync

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

17476

Message:

amd64 compile fixes.

File:

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

trunk/src/VBox/VMM/VM.cpp

@@ -97 +97 @@
 *******************************************************************************/
 static int  vmR3Create(PVM pVM, PFNVMATERROR pfnVMAtError, void *pvUserVM, PFNCFGMCONSTRUCTOR pfnCFGMConstructor, void *pvUserCFGM);
+static void vmR3CallVMAtError(PFNVMATERROR pfnVMAtError, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, ...);
 static int  vmR3InitRing3(PVM pVM);
 static int  vmR3InitRing0(PVM pVM);
@@ -301 +302 @@
                 AssertMsgFailed(("Add error message for rc=%d (%Vrc)\n", rc, rc));
         }
-        pfnVMAtError(NULL, pvUserVM, rc, RT_SRC_POS, pszError, (va_list)&rc); /** @todo r=bird: this isn't portable to AMD64, please fix. */
+        vmR3CallVMAtError(pfnVMAtError, pvUserVM, rc, RT_SRC_POS, pszError, rc);
     }
 
@@ -307 +308 @@
     return rc;
 }
+
+
+/**
+ * Wrapper for getting a correct va_list.
+ */
+static void vmR3CallVMAtError(PFNVMATERROR pfnVMAtError, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, ...)
+{
+    va_list va;
+    va_start(va, pszError);
+    pfnVMAtError(NULL, pvUser, rc, RT_SRC_POS_ARGS, pszError, va);
+    va_end(va);
+}
+
 
 /**