Changeset 23598 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Oct 7, 2009 3:00:16 PM (16 years ago)

Author:

vboxsync

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

53270

Message:

VMM,Main,VBoxBFE: Split up VMR3Load into VMR3LoadFromFile and VMR3LoadFromStream; added VMR3Migrate.

Location:

trunk/src/VBox/Frontends/VBoxBFE

Files:

• VBoxBFE.cpp (modified) (3 diffs)
• VBoxBFE.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -333 +333 @@
  * Update progress display.
  */
-void callProgressInfo(PVM pVM, unsigned uPercent, void *pvUser)
+int callProgressInfo(PVM pVM, unsigned uPercent, void *pvUser)
 {
     if (gConsole)
         gConsole->progressInfo(pVM, uPercent, pvUser);
+    return VINF_SUCCESS;
 }
 
@@ -965 +966 @@
         {
             /* Power off VM */
-            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3PowerOff, 1, pVM);
+            rc = VMR3PowerOff(pVM);
             AssertRC(rc);
         }
@@ -1276 +1277 @@
         {
             startProgressInfo("Restoring");
-            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY,
-                             (PFNRT)VMR3Load, 4, pVM, g_pszStateFile, &callProgressInfo, (uintptr_t)NULL);
+            rc = VMR3LoadFromFile(pVM, g_pszStateFile, callProgressInfo, (uintptr_t)NULL);
             endProgressInfo();
             if (RT_SUCCESS(rc))
             {
-                rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3Resume, 1, pVM);
+                rc = VMR3Resume(pVM);
                 AssertRC(rc);
                 gDisplay->setRunning();
             }
             else
-                AssertMsgFailed(("VMR3Load failed, rc=%Rrc\n", rc));
+                AssertMsgFailed(("VMR3LoadFromFile failed, rc=%Rrc\n", rc));
         }
         else
         {
-            rc = VMR3ReqCallWait(pVM, VMCPUID_ANY, (PFNRT)VMR3PowerOn, 1, pVM);
+            rc = VMR3PowerOn(pVM);
             if (RT_FAILURE(rc))
                 AssertMsgFailed(("VMR3PowerOn failed, rc=%Rrc\n", rc));

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.h

@@ -55 +55 @@
 
 void   startProgressInfo(const char *pszStr);
-void   callProgressInfo(PVM pVM, unsigned uPercent, void *pvUser);
+int    callProgressInfo(PVM pVM, unsigned uPercent, void *pvUser);
 void   endProgressInfo();
 bool   fActivateHGCM();