Changeset 78286 in vbox for trunk

Timestamp:

Apr 25, 2019 8:12:53 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8664. Adding IMachine::appyDefaults call (disabled).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm

Files:

• UIWizardNewVM.cpp (modified) (2 diffs)
• UIWizardNewVM.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -120 +120 @@
     }
 
-    if (configureVM(strTypeId, type))
-        return attachDefaultDevices(type);
-    return false;
-}
-
-bool UIWizardNewVM::configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType)
+#if 1
+    /* Configure the newly created vm here in GUI by several calls to API. */
+    configureVM(strTypeId, type);
+#else
+    /* The newer and less tested way of configuring vms. */
+    m_machine.ApplyDefaults(QString());
+#endif
+
+    /* Register the VM prior to attaching hard disks: */
+    vbox.RegisterMachine(m_machine);
+    if (!vbox.isOk())
+    {
+        msgCenter().cannotRegisterMachine(vbox, m_machine.GetName(), this);
+        return false;
+    }
+    return attachDefaultDevices(type);
+}
+
+void UIWizardNewVM::configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType)
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
@@ -262 +275 @@
     if (comGuestType.GetRecommended3DAcceleration())
         m_machine.SetAccelerate3DEnabled(comGuestType.GetRecommended3DAcceleration());
-
-    /* Register the VM prior to attaching hard disks: */
-    vbox.RegisterMachine(m_machine);
-    if (!vbox.isOk())
-    {
-        msgCenter().cannotRegisterMachine(vbox, m_machine.GetName(), this);
-        return false;
-    }
-    return true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -64 +64 @@
     bool createVM();
     /* Configures the newly created VM: */
-    bool configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType);
+    void configureVM(const QString &strGuestTypeId, const CGuestOSType &comGuestType);
     /* Attaches default devices: */
     bool attachDefaultDevices(const CGuestOSType &comGuestType);