Changeset 78387 in vbox for trunk/src

Timestamp:

May 6, 2019 12:32:22 PM (6 years ago)

Author:

vboxsync

Message:

Main: bugref:8612: Fixed error during MacOS guest creation using GUI

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (2 diffs)

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

@@ -233 +233 @@
     }
 
-    /* Liomit the AHCI port count if it's used because windows has trouble with
+    /* Limit the AHCI port count if it's used because windows has trouble with
        too many ports and other guest (OS X in particular) may take extra long
        to boot: */

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

@@ -15159 +15159 @@
                        ? settings::Hardware::LongMode_Enabled : settings::Hardware::LongMode_Disabled;
 
+    /* Let the OS type enable the X2APIC */
+    mHWData->mX2APIC = osType->i_recommendedX2APIC();
+
+    /* This one covers IOAPICEnabled. */
+    mBIOSSettings->i_applyDefaults(osType);
+
+    /* Initialize default record settings. */
+    mRecordingSettings->i_applyDefaults();
+
+    /* Initialize default BIOS settings here */
+    /* Hardware virtualization must be ON by default */
+    mHWData->mAPIC = true;
+    mHWData->mHWVirtExEnabled = true;
+
+    rc = osType->COMGETTER(RecommendedRAM)(&mHWData->mMemorySize);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedGraphicsController)(&mHWData->mGraphicsControllerType);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedVRAM)(&mHWData->mVRAMSize);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(Recommended2DVideoAcceleration)(&mHWData->mAccelerate2DVideoEnabled);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(Recommended3DAcceleration)(&mHWData->mAccelerate3DEnabled);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedFirmware)(&mHWData->mFirmwareType);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedPAE)(&mHWData->mPAEEnabled);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedHPET)(&mHWData->mHPETEnabled);
+    if (FAILED(rc)) return rc;
+
+    BOOL mRTCUseUTC;
+    rc = osType->COMGETTER(RecommendedRTCUseUTC)(&mRTCUseUTC);
+    if (FAILED(rc)) return rc;
+
+    setRTCUseUTC(mRTCUseUTC);
+    if (FAILED(rc)) return rc;
+
+    ChipsetType_T enmChipsetType;
+    rc = osType->COMGETTER(RecommendedChipset)(&enmChipsetType);
+    if (FAILED(rc)) return rc;
+
+    rc = COMSETTER(ChipsetType)(enmChipsetType);
+    if (FAILED(rc)) return rc;
+
+    rc = osType->COMGETTER(RecommendedTFReset)(&mHWData->mTripleFaultReset);
+    if (FAILED(rc)) return rc;
+
+    size_t mnet = mNetworkAdapters.size(); NOREF(mnet);
     /* Apply network adapters defaults */
     for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot)
@@ -15170 +15226 @@
     for (ULONG slot = 0; slot < RT_ELEMENTS(mParallelPorts); ++slot)
         mParallelPorts[slot]->i_applyDefaults();
-
-
-    /* Let the OS type enable the X2APIC */
-    mHWData->mX2APIC = osType->i_recommendedX2APIC();
-
-    /* This one covers IOAPICEnabled. */
-    mBIOSSettings->i_applyDefaults(osType);
-
-    /* Initialize default record settings. */
-    mRecordingSettings->i_applyDefaults();
-
-    /* Initialize default BIOS settings here */
-    /* Hardware virtualization must be ON by default */
-    //mHWData->mAPIC = true;
-    //mHWData->mHWVirtExEnabled = true;
-
-    rc = osType->COMGETTER(RecommendedRAM)(&mHWData->mMemorySize);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedGraphicsController)(&mHWData->mGraphicsControllerType);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedVRAM)(&mHWData->mVRAMSize);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(Recommended2DVideoAcceleration)(&mHWData->mAccelerate2DVideoEnabled);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(Recommended3DAcceleration)(&mHWData->mAccelerate3DEnabled);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedFirmware)(&mHWData->mFirmwareType);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedPAE)(&mHWData->mPAEEnabled);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedHPET)(&mHWData->mHPETEnabled);
-    if (FAILED(rc)) return rc;
-
-    BOOL mRTCUseUTC;
-    rc = osType->COMGETTER(RecommendedRTCUseUTC)(&mRTCUseUTC);
-    if (FAILED(rc)) return rc;
-
-    setRTCUseUTC(mRTCUseUTC);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedChipset)(&mHWData->mChipsetType);
-    if (FAILED(rc)) return rc;
-
-    rc = osType->COMGETTER(RecommendedTFReset)(&mHWData->mTripleFaultReset);
-    if (FAILED(rc)) return rc;
 
     /* Audio stuff. */