Changeset 90460 in vbox

Timestamp:

Aug 1, 2021 8:55:36 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Put the RTTHREAD handle in the VM structure too, so VMMDev can use it for poking EMTs in new testmode. bugref:6695

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (3 diffs)
• include/VBox/vmm/vm.mac (modified) (1 diff)
• src/VBox/VMM/VMMR3/VM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -32 +32 @@
 #ifndef VBOX_FOR_DTRACE_LIB
 # ifndef USING_VMM_COMMON_DEFS
-#  error "Compile job does not include VMM_COMMON_DEFS from src/VBox/Config.kmk - make sure you really need to include this file!"
+#  error "Compile job does not include VMM_COMMON_DEFS from src/VBox/VMM/Config.kmk - make sure you really need to include this file!"
 # endif
 # include <iprt/param.h>
@@ -156 +156 @@
     /** The native R0 thread handle. (different from the R3 handle!) */
     RTNATIVETHREAD          hNativeThreadR0;
+    /** The IPRT thread handle (for VMMDevTesting). */
+    RTTHREAD                hThread;
     /** The CPU ID.
      * This is the index into the VM::aCpu array. */
@@ -172 +174 @@
      *          following it (to grow into and align the struct size).
      */
-    uint8_t                 abAlignment1[64 - 5 * (HC_ARCH_BITS == 32 ? 4 : 8) - 8 - 4];
+    uint8_t                 abAlignment1[64 - 6 * (HC_ARCH_BITS == 32 ? 4 : 8) - 8 - 4];
     /** @} */
 

trunk/include/VBox/vmm/vm.mac

@@ -55 +55 @@
     .pVMRC                  resq 1
     .pUVCpu                 RTR3PTR_RES 1
-    .hNativeThread          RTR0PTR_RES 1
+    .hNativeThread          RTR3PTR_RES 1
     .hNativeThreadR0        RTR0PTR_RES 1
+    .hThread                RTR3PTR_RES 1
     .idCpu                  resd 1
 

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

@@ -605 +605 @@
             pVCpu->idCpu             = i;
             pVCpu->hNativeThread     = pUVM->aCpus[i].vm.s.NativeThreadEMT;
+            pVCpu->hThread           = pUVM->aCpus[i].vm.s.ThreadEMT;
             Assert(pVCpu->hNativeThread != NIL_RTNATIVETHREAD);
             /* hNativeThreadR0 is initialized on EMT registration. */