Changeset 45503 in vbox for trunk/src/VBox/VMM/include/HMInternal.h

Timestamp:

Apr 12, 2013 1:17:01 AM (12 years ago)

Author:

vboxsync

Message:

HM: Alignment fixes. s/u32InstrLen/cbInstr/g. A couple of doxygen fixes. Changed a few 'unsigned' structure members to 'uint32_t' - we stopped believing in 'unsigned' 6-7 years ago.

File:

• trunk/src/VBox/VMM/include/HMInternal.h (modified) (7 diffs)

trunk/src/VBox/VMM/include/HMInternal.h

@@ -582 +582 @@
     uint32_t                    u32Alignment;
 
-    /* Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */
+    /** Host's TSC_AUX MSR (used when RDTSCP doesn't cause VM-exits). */
     uint64_t                    u64HostTscAux;
 
@@ -655 +655 @@
         R0PTRTYPE(void *)           pvHostMsr;
 
-        /* Number of automatically loaded/restored guest MSRs during the world switch. */
+        /** Number of automatically loaded/restored guest MSRs during the world switch. */
         uint32_t                    cGuestMsrs;
         uint32_t                    uAlignment;
 #endif /* VBOX_WITH_AUTO_MSR_LOAD_RESTORE */
 
-        /* The cached APIC-base MSR used for identifying when to map the HC physical APIC-access page. */
+        /** The cached APIC-base MSR used for identifying when to map the HC physical APIC-access page. */
         uint64_t                    u64MsrApicBase;
-        /* Last use TSC offset value. (cached) */
+        /** Last use TSC offset value. (cached) */
         uint64_t                    u64TSCOffset;
         /** VMCS cache. */
@@ -731 +731 @@
         uint32_t                    fPending;
         uint32_t                    u32ErrCode;
-        uint32_t                    u32InstrLen;
+        uint32_t                    cbInstr;
+        uint32_t                    u32Padding; /**< Explicit alignment padding. */
         uint64_t                    u64IntrInfo;
     } Event;
@@ -749 +750 @@
     struct
     {
-        /* Pending IO operation type. */
-        HMPENDINGIO         enmType;
+        /** Pending IO operation type. */
+        HMPENDINGIO             enmType;
         uint32_t                uPadding;
         RTGCPTR                 GCPtrRip;
@@ -758 +759 @@
             struct
             {
-                unsigned        uPort;
-                unsigned        uAndVal;
-                unsigned        cbSize;
+                uint32_t        uPort;
+                uint32_t        uAndVal;
+                uint32_t        cbSize;
             } Port;
             uint64_t            aRaw[2];
@@ -781 +782 @@
     {
         RTGCPTR             aPages[HM_MAX_TLB_SHOOTDOWN_PAGES];
-        unsigned            cPages;
+        uint32_t            cPages;
+        uint32_t            u32Padding; /**< Explicit alignment padding. */
     } TlbShootdown;
 
@@ -788 +790 @@
     DISCPUSTATE             DisState;
 
-    uint32_t                padding2[1];
-
     STAMPROFILEADV          StatEntry;
     STAMPROFILEADV          StatExit1;
     STAMPROFILEADV          StatExit2;
-#ifdef VBOX_WITH_OLD_VTX_CODE /* temporary for tracking down darwin issues. */
+#ifdef VBOX_WITH_OLD_VTX_CODE /* "temporary" for tracking down darwin issues. */
     STAMPROFILEADV          StatExit2Sub1;
     STAMPROFILEADV          StatExit2Sub2;