Changeset 58164 in vbox

Timestamp:

Oct 9, 2015 7:48:10 PM (9 years ago)

Author:

vboxsync

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

103272

Message:

VMMDEVFACILITYSTATUSENTRY: Use enums, there isn't any space to save here.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (13 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -714 +714 @@
  *          (table full).
  * @param   pThis           The VMMDev instance data.
- * @param   uFacility       The facility type code - VBoxGuestFacilityType.
+ * @param   enmFacility     The facility type code.
  * @param   fFixed          This is set when allocating the standard entries
  *                          from the constructor.
@@ -720 +720 @@
  */
 static PVMMDEVFACILITYSTATUSENTRY
-vmmdevAllocFacilityStatusEntry(PVMMDEV pThis, uint32_t uFacility, bool fFixed, PCRTTIMESPEC pTimeSpecNow)
+vmmdevAllocFacilityStatusEntry(PVMMDEV pThis, VBoxGuestFacilityType enmFacility, bool fFixed, PCRTTIMESPEC pTimeSpecNow)
 {
     /* If full, expunge one inactive entry. */
@@ -728 +728 @@
         while (i-- > 0)
         {
-            if (   pThis->aFacilityStatuses[i].uStatus == VBoxGuestFacilityStatus_Inactive
+            if (   pThis->aFacilityStatuses[i].enmStatus == VBoxGuestFacilityStatus_Inactive
                 && !pThis->aFacilityStatuses[i].fFixed)
             {
@@ -748 +748 @@
     uint32_t i = pThis->cFacilityStatuses;
     while (i-- > 0)
-        if (pThis->aFacilityStatuses[i].uFacility < uFacility)
+        if ((uint32_t)pThis->aFacilityStatuses[i].enmFacility < (uint32_t)enmFacility)
             break;
     i++;
@@ -760 +760 @@
 
     /* Initialize. */
-    pThis->aFacilityStatuses[i].uFacility   = uFacility;
-    pThis->aFacilityStatuses[i].uStatus     = VBoxGuestFacilityStatus_Inactive;
-    pThis->aFacilityStatuses[i].fFixed      = fFixed;
-    pThis->aFacilityStatuses[i].fPadding    = 0;
-    pThis->aFacilityStatuses[i].fFlags      = 0;
-    pThis->aFacilityStatuses[i].uPadding    = 0;
+    pThis->aFacilityStatuses[i].enmFacility  = enmFacility;
+    pThis->aFacilityStatuses[i].enmStatus    = VBoxGuestFacilityStatus_Inactive;
+    pThis->aFacilityStatuses[i].fFixed       = fFixed;
+    pThis->aFacilityStatuses[i].afPadding[0] = 0;
+    pThis->aFacilityStatuses[i].afPadding[1] = 0;
+    pThis->aFacilityStatuses[i].afPadding[2] = 0;
+    pThis->aFacilityStatuses[i].fFlags       = 0;
     if (pTimeSpecNow)
         pThis->aFacilityStatuses[i].TimeSpecTS = *pTimeSpecNow;
@@ -781 +782 @@
  *          (table full).
  * @param   pThis           The VMMDev instance data.
- * @param   uFacility       The facility type code - VBoxGuestFacilityType.
- */
-static PVMMDEVFACILITYSTATUSENTRY vmmdevGetFacilityStatusEntry(PVMMDEV pThis, uint32_t uFacility)
+ * @param   enmFacility     The facility type code.
+ */
+static PVMMDEVFACILITYSTATUSENTRY vmmdevGetFacilityStatusEntry(PVMMDEV pThis, VBoxGuestFacilityType enmFacility)
 {
     /** @todo change to binary search. */
@@ -789 +790 @@
     while (i-- > 0)
     {
-        if (pThis->aFacilityStatuses[i].uFacility == uFacility)
+        if (pThis->aFacilityStatuses[i].enmFacility == enmFacility)
             return &pThis->aFacilityStatuses[i];
-        if (pThis->aFacilityStatuses[i].uFacility < uFacility)
-            break;
-    }
-    return vmmdevAllocFacilityStatusEntry(pThis, uFacility, false /*fFixed*/, NULL);
+        if ((uint32_t)pThis->aFacilityStatuses[i].enmFacility < (uint32_t)enmFacility)
+            break;
+    }
+    return vmmdevAllocFacilityStatusEntry(pThis, enmFacility, false /*fFixed*/, NULL);
 }
 
@@ -831 +832 @@
         {
             pThis->aFacilityStatuses[i].TimeSpecTS = Now;
-            pThis->aFacilityStatuses[i].uStatus    = (uint16_t)pStatus->status;
+            pThis->aFacilityStatuses[i].enmStatus  = pStatus->status;
             pThis->aFacilityStatuses[i].fFlags     = pStatus->flags;
         }
@@ -845 +846 @@
 
         pEntry->TimeSpecTS = Now;
-        pEntry->uStatus    = (uint16_t)pStatus->status; /** @todo r=andy uint16_t vs. 32-bit enum. */
+        pEntry->enmStatus  = pStatus->status;
         pEntry->fFlags     = pStatus->flags;
     }
@@ -3518 +3519 @@
     for (uint32_t i = 0; i < pThis->cFacilityStatuses; i++)
     {
-        SSMR3PutU32(pSSM, pThis->aFacilityStatuses[i].uFacility);
+        SSMR3PutU32(pSSM, pThis->aFacilityStatuses[i].enmFacility);
         SSMR3PutU32(pSSM, pThis->aFacilityStatuses[i].fFlags);
-        SSMR3PutU16(pSSM, pThis->aFacilityStatuses[i].uStatus);
+        SSMR3PutU16(pSSM, (uint16_t)pThis->aFacilityStatuses[i].enmStatus);
         SSMR3PutS64(pSSM, RTTimeSpecGetNano(&pThis->aFacilityStatuses[i].TimeSpecTS));
     }
@@ -3641 +3642 @@
             AssertRCReturn(rc, rc);
 
-            PVMMDEVFACILITYSTATUSENTRY pEntry = vmmdevGetFacilityStatusEntry(pThis, uFacility);
+            PVMMDEVFACILITYSTATUSENTRY pEntry = vmmdevGetFacilityStatusEntry(pThis, (VBoxGuestFacilityType)uFacility);
             AssertLogRelMsgReturn(pEntry,
                                   ("VMMDev: Ran out of entries restoring the guest facility statuses. Saved state has %u.\n", cFacilityStatuses),
                                   VERR_OUT_OF_RESOURCES);
-            pEntry->uStatus = uStatus;
-            pEntry->fFlags  = fFlags;
+            pEntry->enmStatus = (VBoxGuestFacilityStatus)uStatus;
+            pEntry->fFlags    = fFlags;
             RTTimeSpecSetNano(&pEntry->TimeSpecTS, iTimeStampNano);
         }
@@ -3697 +3698 @@
             {
                 for (uint32_t i = 0; i < pThis->cFacilityStatuses; i++) /* ascending order! */
-                    if (   pThis->aFacilityStatuses[i].uStatus != VBoxGuestFacilityStatus_Inactive
+                    if (   pThis->aFacilityStatuses[i].enmStatus != VBoxGuestFacilityStatus_Inactive
                         || !pThis->aFacilityStatuses[i].fFixed)
                         pThis->pDrv->pfnUpdateGuestStatus(pThis->pDrv,
-                                                          pThis->aFacilityStatuses[i].uFacility,
-                                                          pThis->aFacilityStatuses[i].uStatus,
+                                                          pThis->aFacilityStatuses[i].enmFacility,
+                                                          (uint16_t)pThis->aFacilityStatuses[i].enmStatus,
                                                           pThis->aFacilityStatuses[i].fFlags,
                                                           &pThis->aFacilityStatuses[i].TimeSpecTS);
@@ -3814 +3815 @@
     while (iFacility-- > 0)
     {
-        pThis->aFacilityStatuses[iFacility].uStatus    = VBoxGuestFacilityStatus_Inactive;
+        pThis->aFacilityStatuses[iFacility].enmStatus  = VBoxGuestFacilityStatus_Inactive;
         pThis->aFacilityStatuses[iFacility].TimeSpecTS = TimeStampNow;
     }

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -93 +93 @@
 typedef struct VMMDEVFACILITYSTATUSENTRY
 {
-    /** The facility, see VBoxGuestFacilityType. */
-    uint32_t    uFacility;
-    /** The status, see VBoxGuestFacilityStatus. */
-    /** @todo r=andy uint16_t vs. uint32_t (VBoxGuestFacilityStatus enum). */
-    uint16_t    uStatus;
+    /** The facility (may contain values other than the defined ones). */
+    VBoxGuestFacilityType       enmFacility;
+    /** The status (may contain values other than the defined ones). */
+    VBoxGuestFacilityStatus     enmStatus;
     /** Whether this entry is fixed and cannot be reused when inactive. */
-    bool        fFixed;
+    bool                        fFixed;
     /** Explicit alignment padding / reserved for future use. MBZ. */
-    bool        fPadding;
+    bool                        afPadding[3];
     /** The facility flags (yet to be defined). */
-    uint32_t    fFlags;
-    /** Explicit alignment padding / reserved for future use. MBZ. */
-    uint32_t    uPadding;
+    uint32_t                    fFlags;
     /** Last update timestamp. */
-    RTTIMESPEC  TimeSpecTS;
+    RTTIMESPEC                  TimeSpecTS;
 } VMMDEVFACILITYSTATUSENTRY;
 /** Pointer to a facility status entry. */