Changeset 101057 in vbox

Timestamp:

Sep 7, 2023 5:12:48 PM (15 months ago)

Author:

vboxsync

Message:

Main: Renamed IPlatformProperties::getStorageBusForStorageControllerType + getStorageControllerTypesForStorageBus -> getStorageBusForControllerType + getStorageControllerTypesForBus, to fix DTrace probe name length restrictions. bugref:10384

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp (modified) (2 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/PlatformPropertiesImpl.h (modified) (1 diff)
• Main/src-all/PlatformPropertiesImpl.cpp (modified) (2 diffs)
• Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -1386 +1386 @@
     {
         /* Enumerate possible types and check whether type is supported or already selected before adding it: */
-        foreach (const KStorageControllerType &enmType, comProperties.GetStorageControllerTypesForStorageBus(enmBus))
+        foreach (const KStorageControllerType &enmType, comProperties.GetStorageControllerTypesForBus(enmBus))
             if (supportedTypes.contains(enmType) || enmType == m_enmType)
                 m_types[enmBus] << enmType;
@@ -3285 +3285 @@
     {
         QAction *pAction = m_addControllerActions.value(enmType);
-        if (supportedBuses.contains(comProperties.GetStorageBusForStorageControllerType(enmType)))
+        if (supportedBuses.contains(comProperties.GetStorageBusForControllerType(enmType)))
             menu.addAction(pAction);
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -12619 +12619 @@
     name="IPlatformProperties"
     extends="$unknown"
-    uuid="fb682653-c51d-42d4-bc30-db7c3e8bf75d"
+    uuid="1ec98a25-d94c-4cfb-a012-5e21481c154c"
     wsmap="managed"
     rest="managed"
@@ -12870 +12870 @@
     </method>
 
-    <method name="getStorageBusForStorageControllerType">
+    <method name="getStorageBusForControllerType">
       <desc>Returns the <link to="StorageBus"/> enum value
         for a given storage controller type.</desc>
@@ -12883 +12883 @@
     </method>
 
-    <method name="getStorageControllerTypesForStorageBus">
+    <method name="getStorageControllerTypesForBus">
       <desc>Returns the possible <link to="StorageControllerType"/> enum values
         for a given storage bus.</desc>

trunk/src/VBox/Main/include/PlatformPropertiesImpl.h

@@ -107 +107 @@
     HRESULT getDeviceTypesForStorageBus(StorageBus_T aBus,
                                         std::vector<DeviceType_T> &aDeviceTypes) RT_OVERRIDE;
-    HRESULT getStorageBusForStorageControllerType(StorageControllerType_T aStorageControllerType,
-                                                  StorageBus_T *aStorageBus) RT_OVERRIDE;
-    HRESULT getStorageControllerTypesForStorageBus(StorageBus_T aStorageBus,
-                                                   std::vector<StorageControllerType_T> &aStorageControllerTypes) RT_OVERRIDE;
+    HRESULT getStorageBusForControllerType(StorageControllerType_T aStorageControllerType,
+                                           StorageBus_T *aStorageBus) RT_OVERRIDE;
+    HRESULT getStorageControllerTypesForBus(StorageBus_T aStorageBus,
+                                            std::vector<StorageControllerType_T> &aStorageControllerTypes) RT_OVERRIDE;
     HRESULT getStorageControllerHotplugCapable(StorageControllerType_T aControllerType,
                                                BOOL *aHotplugCapable) RT_OVERRIDE;

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -474 +474 @@
 }
 
-HRESULT PlatformProperties::getStorageBusForStorageControllerType(StorageControllerType_T aStorageControllerType,
-                                                                  StorageBus_T *aStorageBus)
+HRESULT PlatformProperties::getStorageBusForControllerType(StorageControllerType_T aStorageControllerType,
+                                                           StorageBus_T *aStorageBus)
 {
     /* no need to lock, this is const */
@@ -514 +514 @@
 }
 
-HRESULT PlatformProperties::getStorageControllerTypesForStorageBus(StorageBus_T aStorageBus,
-                                                                   std::vector<StorageControllerType_T> &aStorageControllerTypes)
+HRESULT PlatformProperties::getStorageControllerTypesForBus(StorageBus_T aStorageBus,
+                                                            std::vector<StorageControllerType_T> &aStorageControllerTypes)
 {
     aStorageControllerTypes.resize(0);

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -4420 +4420 @@
 
     StorageBus_T enmStorageBus = StorageBus_Null;
-    HRESULT hrc = platformProperties->GetStorageBusForStorageControllerType(aStorageControllerType, &enmStorageBus);
+    HRESULT hrc = platformProperties->GetStorageBusForControllerType(aStorageControllerType, &enmStorageBus);
     if (FAILED(hrc))
         return hrc;