Changeset 101220 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 21, 2023 10:51:17 AM (18 months ago)

Author:

vboxsync

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

159198

Message:

Main: Moved i_controllerNameFromBusType() from Machine to StorageController, also now as a static function, and use this also in the Unattended installer, to avoid code duplication.

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (5 diffs)
• StorageControllerImpl.cpp (modified) (1 diff)
• UnattendedImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-server/MachineImpl.cpp ¶

@@ -58 +58 @@
 #include "AutostartDb.h"
 #include "SystemPropertiesImpl.h"
+#include "StorageControllerImpl.h"
 #include "MachineImplMoveVM.h"
 #include "ExtPackManagerImpl.h"
@@ -15115 +15116 @@
 }
 
-com::Utf8Str Machine::i_controllerNameFromBusType(StorageBus_T aBusType)
-{
-    com::Utf8Str strControllerName = "Unknown";
-    switch (aBusType)
-    {
-        case StorageBus_IDE:
-        {
-            strControllerName = "IDE";
-            break;
-        }
-        case StorageBus_SATA:
-        {
-            strControllerName = "SATA";
-            break;
-        }
-        case StorageBus_SCSI:
-        {
-            strControllerName = "SCSI";
-            break;
-        }
-        case StorageBus_Floppy:
-        {
-            strControllerName = "Floppy";
-            break;
-        }
-        case StorageBus_SAS:
-        {
-            strControllerName = "SAS";
-            break;
-        }
-        case StorageBus_USB:
-        {
-            strControllerName = "USB";
-            break;
-        }
-        case StorageBus_PCIe:
-        {
-            strControllerName = "PCIe";
-            break;
-        }
-        case StorageBus_VirtioSCSI:
-        {
-            strControllerName = "VirtioSCSI";
-            break;
-        }
-        default:
-            AssertFailed(); /* Catch missing case above. */
-            break;
-    }
-    return strControllerName;
-}
-
 HRESULT Machine::applyDefaults(const com::Utf8Str &aFlags)
 {
@@ -15272 +15221 @@
 
     /* GUI auto generates controller names using bus type. Do the same*/
-    strFloppyName = i_controllerNameFromBusType(StorageBus_Floppy);
+    strFloppyName = StorageController::i_controllerNameFromBusType(StorageBus_Floppy);
 
     /* Floppy recommended? add one. */
@@ -15290 +15239 @@
     if (FAILED(hrc)) return hrc;
 
-    strDVDName = i_controllerNameFromBusType(dvdStorageBusType);
+    strDVDName = StorageController::i_controllerNameFromBusType(dvdStorageBusType);
 
     hrc = addStorageController(strDVDName, dvdStorageBusType, dvdController);
@@ -15305 +15254 @@
     if (FAILED(hrc)) return hrc;
 
-    strHDName = i_controllerNameFromBusType(hdStorageBusType);
+    strHDName = StorageController::i_controllerNameFromBusType(hdStorageBusType);
 
     if (hdStorageBusType != dvdStorageBusType && hdStorageControllerType != dvdStorageControllerType)

trunk/src/VBox/Main/src-server/StorageControllerImpl.cpp ¶

@@ -806 +806 @@
 }
 
+/**
+ * Returns a controller name from a given storage bus type.
+ *
+ * @return Controller name.
+ * @param  aBusType             Bus type to get controller name for.
+ */
+/* static */
+com::Utf8Str StorageController::i_controllerNameFromBusType(StorageBus_T aBusType)
+{
+    com::Utf8Str strControllerName = "Unknown";
+    switch (aBusType)
+    {
+        case StorageBus_IDE:
+        {
+            strControllerName = "IDE";
+            break;
+        }
+        case StorageBus_SATA:
+        {
+            strControllerName = "SATA";
+            break;
+        }
+        case StorageBus_SCSI:
+        {
+            strControllerName = "SCSI";
+            break;
+        }
+        case StorageBus_Floppy:
+        {
+            strControllerName = "Floppy";
+            break;
+        }
+        case StorageBus_SAS:
+        {
+            strControllerName = "SAS";
+            break;
+        }
+        case StorageBus_USB:
+        {
+            strControllerName = "USB";
+            break;
+        }
+        case StorageBus_PCIe:
+        {
+            strControllerName = "PCIe";
+            break;
+        }
+        case StorageBus_VirtioSCSI:
+        {
+            strControllerName = "VirtioSCSI";
+            break;
+        }
+        default:
+            AssertFailed(); /* Catch missing case above. */
+            break;
+    }
+    return strControllerName;
+}
+
 Machine* StorageController::i_getMachine()
 {

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp ¶

@@ -3182 +3182 @@
         if (strRecommendedControllerName.isEmpty())
         {
-            switch (enmRecommendedStorageBus)
-            {
-                case StorageBus_IDE:    strRecommendedControllerName = "IDE";  break;
-                case StorageBus_SATA:   strRecommendedControllerName = "SATA"; break;
-                case StorageBus_SCSI:   strRecommendedControllerName = "SCSI"; break;
-                case StorageBus_SAS:    strRecommendedControllerName = "SAS";  break;
-                case StorageBus_USB:    strRecommendedControllerName = "USB";  break;
-                case StorageBus_PCIe:   strRecommendedControllerName = "PCIe"; break;
-                default:
-                    return setError(E_FAIL, tr("Support for recommended storage bus %d not implemented"),
-                                    (int)enmRecommendedStorageBus);
-            }
+            strRecommendedControllerName = StorageController::i_controllerNameFromBusType(enmRecommendedStorageBus);
+
             ComPtr<IStorageController> ptrControllerIgnored;
             hrc = rPtrSessionMachine->AddStorageController(Bstr(strRecommendedControllerName).raw(), enmRecommendedStorageBus,