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

Timestamp:

Jan 22, 2025 3:31:45 PM (3 months ago)

Author:

vboxsync

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

167114

Message:

VMM,VBox/types.h,VBox/err.h: Added VM target platform arch members to the VM structures (mostly for ring-0). Also added the structure sizes and svn revision to VMMR0_DO_GVMM_CREATE_VM. jiraref:VBP-1470

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• GVMMR3.cpp (modified) (5 diffs)
• VM.cpp (modified) (2 diffs)

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

@@ -46 +46 @@
  * @returns VBox status code.
  * @param   pUVM        The user mode VM handle.
+ * @param   enmTarget   The target platform architecture of the VM.
  * @param   cCpus       The number of CPUs to create the VM for.
  * @param   pSession    The support driver session handle.
@@ -52 +53 @@
  *                      for use in VMMR0 calls.
  */
-VMMR3_INT_DECL(int) GVMMR3CreateVM(PUVM pUVM, uint32_t cCpus, PSUPDRVSESSION pSession, PVM *ppVM, PRTR0PTR ppVMR0)
+VMMR3_INT_DECL(int) GVMMR3CreateVM(PUVM pUVM, VMTARGET enmTarget, uint32_t cCpus, PSUPDRVSESSION pSession,
+                                   PVM *ppVM, PRTR0PTR ppVMR0)
 {
     AssertReturn(cCpus >= VMM_MIN_CPU_COUNT && cCpus <= VMM_MAX_CPU_COUNT, VERR_INVALID_PARAMETER);
+    AssertReturn(enmTarget == VMTARGET_X86 || enmTarget == VMTARGET_ARMV8, VERR_INVALID_PARAMETER);
     AssertCompile((sizeof(VM)    & HOST_PAGE_OFFSET_MASK) == 0);
     AssertCompile((sizeof(VMCPU) & HOST_PAGE_OFFSET_MASK) == 0);
@@ -65 +68 @@
         CreateVMReq.Hdr.cbReq       = sizeof(CreateVMReq);
         CreateVMReq.pSession        = pSession;
+        CreateVMReq.enmTarget       = enmTarget;
+        CreateVMReq.cCpus           = cCpus;
+        CreateVMReq.cbVM            = sizeof(VM);
+        CreateVMReq.cbVCpu          = sizeof(VMCPU);
+        CreateVMReq.uStructVersion  = 1;
+        CreateVMReq.uSvnRevision    = VMMGetSvnRev();
         CreateVMReq.pVMR0           = NIL_RTR0PTR;
         CreateVMReq.pVMR3           = NULL;
-        CreateVMReq.cCpus           = cCpus;
         rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_GVMM_CREATE_VM, 0, &CreateVMReq.Hdr);
         if (RT_SUCCESS(rc))
@@ -73 +81 @@
             *ppVM   = CreateVMReq.pVMR3;
             *ppVMR0 = CreateVMReq.pVMR0;
+            Assert(CreateVMReq.pVMR3->enmTarget == enmTarget);
         }
     }
@@ -101 +110 @@
         pVM->cbVCpu               = sizeof(VMCPU);
         pVM->uStructVersion       = 1;
+        pVM->enmTarget            = enmTarget;
 
         /* CPUs: */

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

@@ -598 +598 @@
      */
     RTR0PTR pVMR0;
-    int rc = GVMMR3CreateVM(pUVM, cCpus, pUVM->vm.s.pSession, &pUVM->pVM, &pVMR0);
+    int rc = GVMMR3CreateVM(pUVM, VMTARGET_DEFAULT, cCpus, pUVM->vm.s.pSession, &pUVM->pVM, &pVMR0);
     if (RT_SUCCESS(rc))
     {
@@ -607 +607 @@
         AssertRelease(pVM->cCpus == cCpus);
         AssertRelease(pVM->uCpuExecutionCap == 100);
+        AssertRelease(pVM->enmTarget == VMTARGET_DEFAULT);
         AssertCompileMemberAlignment(VM, cpum, 64);
         AssertCompileMemberAlignment(VM, tm, 64);