Changeset 85011 in vbox for trunk/src

Timestamp:

Jun 30, 2020 5:28:26 PM (5 years ago)

Author:

vboxsync

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

138911

Message:

Main/BusAssignmentManager: Prepend global variables with "g_".

File:

• trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp

@@ -55 +55 @@
 
 /* Generic rules */
-static const DeviceAssignmentRule aGenericRules[] =
+static const DeviceAssignmentRule g_aGenericRules[] =
 {
     /* VGA controller */
@@ -106 +106 @@
 
 /* PIIX3 chipset rules */
-static const DeviceAssignmentRule aPiix3Rules[] =
+static const DeviceAssignmentRule g_aPiix3Rules[] =
 {
     {"piix3ide",      0,  1,  1, 0},
@@ -118 +118 @@
 
 /* ICH9 chipset rules */
-static const DeviceAssignmentRule aIch9Rules[] =
+static const DeviceAssignmentRule g_aIch9Rules[] =
 {
     /* Host Controller */
@@ -238 +238 @@
  * to device number 23 when the VM is configured for an AMD IOMMU.
  */
-static const DeviceAssignmentRule aIch9IommuLsiRules[] =
+static const DeviceAssignmentRule g_aIch9IommuLsiRules[] =
 {
     /* AMD IOMMU. */
@@ -252 +252 @@
 
 /* LSI Logic Controller. */
-static const DeviceAssignmentRule aIch9LsiRules[] =
+static const DeviceAssignmentRule g_aIch9LsiRules[] =
 {
     /* Storage controller */
@@ -260 +260 @@
 
 /* Aliasing rules */
-static const DeviceAliasRule aDeviceAliases[] =
+static const DeviceAliasRule g_aDeviceAliases[] =
 {
     {"e1000",       "nic"},
@@ -390 +390 @@
 {
     size_t iRuleset, iRule;
-    const DeviceAssignmentRule *aArrays[3] = {aGenericRules, NULL, NULL};
+    const DeviceAssignmentRule *aArrays[3] = {g_aGenericRules, NULL, NULL};
 
     switch (mChipsetType)
     {
         case ChipsetType_PIIX3:
-            aArrays[1] = aPiix3Rules;
+            aArrays[1] = g_aPiix3Rules;
             break;
         case ChipsetType_ICH9:
         {
-            aArrays[1] = aIch9Rules;
+            aArrays[1] = g_aIch9Rules;
 #ifdef VBOX_WITH_IOMMU_AMD
             if (mfIommu)
-                aArrays[2] = aIch9IommuLsiRules;
+                aArrays[2] = g_aIch9IommuLsiRules;
             else
 #endif
             {
-                aArrays[2] = aIch9LsiRules;
+                aArrays[2] = g_aIch9LsiRules;
             }
             break;
@@ -430 +430 @@
 const char *BusAssignmentManager::State::findAlias(const char *pszDev)
 {
-    for (size_t iAlias = 0; iAlias < RT_ELEMENTS(aDeviceAliases); iAlias++)
-    {
-        if (strcmp(pszDev, aDeviceAliases[iAlias].pszDevName) == 0)
-            return aDeviceAliases[iAlias].pszDevAlias;
+    for (size_t iAlias = 0; iAlias < RT_ELEMENTS(g_aDeviceAliases); iAlias++)
+    {
+        if (strcmp(pszDev, g_aDeviceAliases[iAlias].pszDevName) == 0)
+            return g_aDeviceAliases[iAlias].pszDevAlias;
     }
     return NULL;