Changeset 13785 in vbox for trunk/src/VBox

Timestamp:

Nov 4, 2008 1:11:37 PM (16 years ago)

Author:

vboxsync

Message:

More updates

Location:

trunk/src/VBox/VMM

Files:

• VM.cpp (modified) (2 diffs)
• VMEmt.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VM.cpp

@@ -470 +470 @@
      */
     GVMMCREATEVMREQ CreateVMReq;
-    CreateVMReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    CreateVMReq.Hdr.cbReq = sizeof(CreateVMReq);
-    CreateVMReq.pSession = pUVM->vm.s.pSession;
-    CreateVMReq.pVMR0 = NIL_RTR0PTR;
-    CreateVMReq.pVMR3 = NULL;
-    CreateVMReq.cCPUs = cCPUs;
+    CreateVMReq.Hdr.u32Magic    = SUPVMMR0REQHDR_MAGIC;
+    CreateVMReq.Hdr.cbReq       = sizeof(CreateVMReq);
+    CreateVMReq.pSession        = pUVM->vm.s.pSession;
+    CreateVMReq.pVMR0           = NIL_RTR0PTR;
+    CreateVMReq.pVMR3           = NULL;
+    CreateVMReq.cCPUs           = cCPUs;
     rc = SUPCallVMMR0Ex(NIL_RTR0PTR, VMMR0_DO_GVMM_CREATE_VM, 0, &CreateVMReq.Hdr);
     if (RT_SUCCESS(rc))
@@ -490 +490 @@
          */
         pVM->pUVM = pUVM;
-        pVM->NativeThreadEMT = pVM->aCpu[0].hNativeThreadR3 = pUVM->vm.s.NativeThreadEMT;
+        pVM->NativeThreadEMT = pUVM->aCpu[0].vm.s.NativeThreadEMT;
+
+        for (unsigned i=0;i<pVM->cCPUs;i++)
+        {
+            pVM->aCpu[i].hNativeThread = pUVM->aCpu[i].vm.s.NativeThreadEMT;
+            Assert(pVM->aCpu[i].hNativeThread!= NIL_RTNATIVETHREAD);
+        }
 
         /*

trunk/src/VBox/VMM/VMEmt.cpp

@@ -215 +215 @@
         vmR3DestroyFinalBitFromEMT(pUVM);
 
-        /* we don't reset ThreadEMT here because it's used in waiting. */
         pUVM->vm.s.NativeThreadEMT = NIL_RTNATIVETHREAD;
     }