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

Timestamp:

Jan 22, 2025 8:04:36 PM (2 months ago)

Author:

vboxsync

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

167124

Message:

VMM: Define VM_STRUCT_VERSION (for use inside the VMM) with a few VMM_COMMON_DEFS defines baked into the value. jiraref:1470

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/GVMMR0.cpp (modified) (2 diffs)
• VMMR3/GVMMR3.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -811 +811 @@
         return VINF_GVM_MISMATCH_VMCPU_SIZE;
     }
-    if (pReq->uStructVersion != 1)
-    {
-        LogRel(("GVMMR0CreateVMReq: uStructVersion=%#x, expcted %#x\n", pReq->uStructVersion, 1));
+    if (pReq->uStructVersion != VM_STRUCT_VERSION)
+    {
+        LogRel(("GVMMR0CreateVMReq: uStructVersion=%#x, expcted %#x\n", pReq->uStructVersion, VM_STRUCT_VERSION));
         return VINF_GVM_MISMATCH_VM_STRUCT_VER;
     }
@@ -1167 +1167 @@
     pGVM->cCpusUnsafe      = cCpus;
     pGVM->uCpuExecutionCap = 100; /* default is no cap. */
-    pGVM->uStructVersion   = 1;
+    pGVM->uStructVersion   = VM_STRUCT_VERSION;
     pGVM->cbSelf           = sizeof(VM);
     pGVM->cbVCpu           = sizeof(VMCPU);

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

@@ -72 +72 @@
         CreateVMReq.cbVM            = sizeof(VM);
         CreateVMReq.cbVCpu          = sizeof(VMCPU);
-        CreateVMReq.uStructVersion  = 1;
+        CreateVMReq.uStructVersion  = VM_STRUCT_VERSION;
         CreateVMReq.uSvnRevision    = VMMGetSvnRev();
         CreateVMReq.pVMR0           = NIL_RTR0PTR;
@@ -109 +109 @@
         pVM->cbSelf               = sizeof(VM);
         pVM->cbVCpu               = sizeof(VMCPU);
-        pVM->uStructVersion       = 1;
+        pVM->uStructVersion       = VM_STRUCT_VERSION;
         pVM->enmTarget            = enmTarget;