Changeset 78296 in vbox for trunk

Timestamp:

Apr 25, 2019 3:52:38 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:8612: Fixed error happened during VM creation with default settings. Also changed storage controller name generation according to bus type

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)
• Main/include/MachineImpl.h (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -281 +281 @@
 
         CHECK_ERROR_BREAK(machine, SaveSettings());
-        if (fRegister)
-        {
-            CHECK_ERROR_BREAK(a->virtualBox, RegisterMachine(machine));
-        }
         if (fDefault)
         {
@@ -291 +287 @@
             CHECK_ERROR_BREAK(machine, SaveSettings());
         }
+        if (fRegister)
+        {
+            CHECK_ERROR_BREAK(a->virtualBox, RegisterMachine(machine));
+        }
+
         Bstr uuid;
         CHECK_ERROR_BREAK(machine, COMGETTER(Id)(uuid.asOutParam()));

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

@@ -721 +721 @@
 
     Utf8Str i_getExtraData(const Utf8Str &strKey);
+
+    com::Utf8Str i_controllerNameFromBusType(StorageBus_T aBusType);
 
 #ifdef VBOX_WITH_GUEST_PROPS

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

@@ -15085 +15085 @@
 }
 
+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;
+        }
+        default:
+            break;
+    }
+    return strControllerName;
+}
+
 HRESULT Machine::applyDefaults(const com::Utf8Str &aFlags)
 {
@@ -15185 +15226 @@
     rc = osType->COMGETTER(RecommendedAudioController)(&audioController);
     if (FAILED(rc)) return rc;
+
     rc = mAudioAdapter->COMSETTER(AudioController)(audioController);
     if (FAILED(rc)) return rc;
@@ -15191 +15233 @@
     rc = osType->COMGETTER(RecommendedAudioCodec)(&audioCodec);
     if (FAILED(rc)) return rc;
+
     rc = mAudioAdapter->COMSETTER(AudioCodec)(audioCodec);
     if (FAILED(rc)) return rc;
@@ -15211 +15254 @@
     Utf8Str strFloppyName, strDVDName, strHDName;
 
-    /* GUI auto generates these - not accesible here - so hardware, at least for now. */
-    strFloppyName = Bstr("Floppy 1").raw();
-    strDVDName = Bstr("DVD 1").raw();
-    strHDName = Bstr("HDD 1").raw();
+    /* GUI auto generates controller names using bus type. Do the same*/
+    strFloppyName = i_controllerNameFromBusType(StorageBus_Floppy);
 
     /* Floppy recommended? add one. */
@@ -15234 +15275 @@
     if (FAILED(rc)) return rc;
 
+    strDVDName = i_controllerNameFromBusType(dvdStorageBusType);
+
     rc = addStorageController(strDVDName,
                               dvdStorageBusType,
@@ -15249 +15292 @@
     if (FAILED(rc)) return rc;
 
+    strHDName = i_controllerNameFromBusType(hdStorageBusType);
+
     if (hdStorageBusType != dvdStorageBusType && hdStorageControllerType != dvdStorageControllerType)
     {
@@ -15263 +15308 @@
         /* The HD controller is the same as DVD: */
         hdController = dvdController;
-        strHDName = Bstr("DVD 1").raw();
     }