Changeset 89589 in vbox

Timestamp:

Jun 10, 2021 8:41:38 AM (3 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Padding and avoid including iommu-intel.h in DevIommuIntel.h.

Location:

trunk/src/VBox/Devices/Bus

Files:

• DevIommuIntel.cpp (modified) (4 diffs)
• DevIommuIntel.h (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevIommuIntel.cpp

@@ -24 +24 @@
 #include "DevIommuIntel.h"
 
+#include <VBox/iommu-intel.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
@@ -346 +347 @@
     uint8_t                     uVerReg;
     /** Alignment. */
-    uint8_t                     abPadding[7];
+    uint8_t                     abPadding0[7];
     /** Copy of CAP_REG. */
     uint64_t                    fCapReg;
@@ -361 +362 @@
     /** DMA request valid permissions mask. */
     uint8_t                     fPermValidMask;
+    /** Alignment. */
+    uint8_t                     abPadding1[6];
 
     /** The event semaphore the invalidation-queue thread waits on. */
     SUPSEMEVENT                 hEvtInvQueue;
+    /** Error diagnostic. */
+    DMARDIAG                    enmDiag;
     /** Padding. */
     uint32_t                    uPadding0;
-    /** Error diagnostic. */
-    DMARDIAG                    enmDiag;
     /** The MMIO handle. */
     IOMMMIOHANDLE               hMmio;
@@ -556 +559 @@
     /** The paging level of the translation. */
     uint8_t             cPagingLevel;
-    uint8_t             afPadding[5];
+    uint8_t             abPadding[5];
     /** The address of the first-level page-table.  */
     uint64_t            GCPhysFlPt;

trunk/src/VBox/Devices/Bus/DevIommuIntel.h

@@ -22 +22 @@
 #endif
 
-#include <VBox/iommu-intel.h>
-
 /** Intel vendor ID for the DMAR unit. */
 #define DMAR_PCI_VENDOR_ID                          0x8086