Changeset 106920 in vbox for trunk/include

Timestamp:

Nov 11, 2024 1:09:38 AM (6 months ago)

Author:

vboxsync

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

165846

Message:

/Config.kmk,Devices/Makefile.kmk,VMM/*: Introducing VBOX_WITH_MINIMAL_R0 for win.arm64 and similar build configurations not really needing much from VMMR0.r0/VBoxSup.sys. jiraref:VBP-1449

Location:

trunk/include/VBox/vmm

Files:

• gvm.h (modified) (11 diffs)
• gvm.mac (modified) (1 diff)

trunk/include/VBox/vmm/gvm.h

@@ -105 +105 @@
     } gvmm;
 
+    union
+    {
+#if defined(VMM_INCLUDED_SRC_include_VMMInternal_h) && defined(IN_RING0)
+        struct VMMR0PERVCPU s;
+#endif
+        uint8_t             padding[896];
+    } vmmr0;
+
+#ifndef VBOX_WITH_MINIMAL_R0
+
     /** The HM per vcpu data. */
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_HMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_HMInternal_h) && defined(IN_RING0)
         struct HMR0PERVCPU  s;
-#endif
+# endif
         uint8_t             padding[1024];
     } hmr0;
 
-#ifdef VBOX_WITH_NEM_R0
+# ifdef VBOX_WITH_NEM_R0
     /** The NEM per vcpu data. */
     union
     {
-# if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
+#  if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
         struct NEMR0PERVCPU s;
-# endif
+#  endif
         uint8_t             padding[64];
     } nemr0;
-#endif
-
-    union
-    {
-#if defined(VMM_INCLUDED_SRC_include_VMMInternal_h) && defined(IN_RING0)
-        struct VMMR0PERVCPU s;
-#endif
-        uint8_t             padding[896];
-    } vmmr0;
-
-    union
-    {
-#if defined(VMM_INCLUDED_SRC_include_PGMInternal_h) && defined(IN_RING0)
+# endif
+
+    union
+    {
+# if defined(VMM_INCLUDED_SRC_include_PGMInternal_h) && defined(IN_RING0)
         struct PGMR0PERVCPU s;
-#endif
+# endif
         uint8_t             padding[576];
     } pgmr0;
 
+#endif /* !VBOX_WITH_MINIMAL_R0 */
+
     /** Padding the structure size to page boundrary. */
-#ifdef VBOX_WITH_NEM_R0
-    uint8_t                 abPadding3[16384 - 64*2 - 256 - 1024 - 64 - 896 - 576];
+#ifdef VBOX_WITH_MINIMAL_R0
+    uint8_t                 abPadding3[16384 - 64*2 - 256 - 896];
+#elif defined(VBOX_WITH_NEM_R0)
+    uint8_t                 abPadding3[16384 - 64*2 - 256 - 896 - 1024 - 64 - 576];
 #else
-    uint8_t                 abPadding3[16384 - 64*2 - 256 - 1024      - 896 - 576];
+    uint8_t                 abPadding3[16384 - 64*2 - 256 - 896 - 1024      - 576];
 #endif
 } GVMCPU;
@@ -157 +163 @@
 AssertCompileMemberAlignment(GVMCPU, idCpu,  16384);
 AssertCompileMemberAlignment(GVMCPU, gvmm,   64);
-# ifdef VBOX_WITH_NEM_R0
+# ifndef VBOX_WITH_MINIMAL_R0
+#  ifdef VBOX_WITH_NEM_R0
 AssertCompileMemberAlignment(GVMCPU, nemr0,  64);
+#  endif
 # endif
 AssertCompileSizeAlignment(GVMCPU,           16384);
@@ -216 +224 @@
     } gvmm;
 
+#ifndef VBOX_WITH_MINIMAL_R0
+
     /** The GMM per vm data. */
     union
     {
-#ifdef VMM_INCLUDED_SRC_VMMR0_GMMR0Internal_h
+# ifdef VMM_INCLUDED_SRC_VMMR0_GMMR0Internal_h
         struct GMMPERVM     s;
-#endif
+# endif
         uint8_t             padding[1024];
     } gmm;
@@ -228 +238 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_HMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_HMInternal_h) && defined(IN_RING0)
         struct HMR0PERVM    s;
-#endif
+# endif
         uint8_t             padding[256];
     } hmr0;
 
-#ifdef VBOX_WITH_NEM_R0
+# ifdef VBOX_WITH_NEM_R0
     /** The NEM per vcpu data. */
     union
     {
-# if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
+#  if defined(VMM_INCLUDED_SRC_include_NEMInternal_h) && defined(IN_RING0)
         struct NEMR0PERVM   s;
-# endif
+#  endif
         uint8_t             padding[256];
     } nemr0;
-#endif
+# endif
 
     /** The RAWPCIVM per vm data. */
     union
     {
-#ifdef VBOX_INCLUDED_rawpci_h
+# ifdef VBOX_INCLUDED_rawpci_h
         struct RAWPCIPERVM s;
-#endif
+# endif
         uint8_t             padding[64];
     } rawpci;
@@ -256 +266 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_PDMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_PDMInternal_h) && defined(IN_RING0)
         struct PDMR0PERVM   s;
-#endif
+# endif
         uint8_t             padding[3008];
     } pdmr0;
@@ -264 +274 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_PGMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_PGMInternal_h) && defined(IN_RING0)
         struct PGMR0PERVM   s;
-#endif
+# endif
         uint8_t             padding[90112];
     } pgmr0;
@@ -272 +282 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_IOMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_IOMInternal_h) && defined(IN_RING0)
         struct IOMR0PERVM   s;
-#endif
+# endif
         uint8_t             padding[512];
     } iomr0;
@@ -280 +290 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_APICInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_APICInternal_h) && defined(IN_RING0)
         struct APICR0PERVM  s;
-#endif
+# endif
         uint8_t             padding[64];
     } apicr0;
@@ -288 +298 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_DBGFInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_DBGFInternal_h) && defined(IN_RING0)
         struct DBGFR0PERVM   s;
-#endif
+# endif
         uint8_t             padding[1024];
     } dbgfr0;
@@ -296 +306 @@
     union
     {
-#if defined(VMM_INCLUDED_SRC_include_TMInternal_h) && defined(IN_RING0)
+# if defined(VMM_INCLUDED_SRC_include_TMInternal_h) && defined(IN_RING0)
         TMR0PERVM           s;
-#endif
+# endif
         uint8_t             padding[192];
     } tmr0;
 
+#endif /* !VBOX_WITH_MINIMAL_R0 */
+
     union
     {
@@ -311 +323 @@
 
     /** Padding so aCpus starts on a page boundrary.  */
-#ifdef VBOX_WITH_NEM_R0
+#ifdef VBOX_WITH_MINIMAL_R0
+    uint8_t         abPadding2[16384*1 - 64 - 4352 -                                                                704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#elif defined(VBOX_WITH_NEM_R0)
     uint8_t         abPadding2[16384*7 - 64 - 4352 - 1024 - 256 - 256 - 64 - 3008 - 90112 - 512 - 64 - 1024 - 192 - 704 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #else

trunk/include/VBox/vmm/gvm.mac

@@ -57 +57 @@
         .gvmm               resb 256
         alignb 64
+        .vmmr0              resb 896
+        alignb 64
         .hmr0               resb 1024
 %ifdef VBOX_WITH_NEM_R0
         .nemr0              resb 64
 %endif
-        alignb 64
-        .vmmr0              resb 896
         alignb 64
         .pgmr0              resb 576