Changeset 101139 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 18, 2023 10:58:57 AM (15 months ago)

Author:

vboxsync

Message:

Main: Added new define VBOX_WITH_ARMV8_HARDCODED_DEFAULTS (enabled by default for darwin.arm64) which sets some hardcoded defaults for newly created VMs. This is needed at least for now to get new VMs off the ground. bugref:10384

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• src-server/GuestOSTypeImpl.cpp (modified) (3 diffs)
• src-server/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -571 +571 @@
         $(if $(VBOX_WITH_FULL_VM_ENCRYPTION),VBOX_WITH_FULL_VM_ENCRYPTION,) \
         $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
-        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_WITH_VIRT_ARMV8,)
+        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_WITH_VIRT_ARMV8,) \
+        $(if $(VBOX_WITH_ARMV8_HARDCODED_DEFAULTS),VBOX_WITH_ARMV8_HARDCODED_DEFAULTS,)
  ifdef VBOX_WITH_USB
   VBoxSVC_DEFS += \

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

@@ -54 +54 @@
     , mAudioCodecType(AudioCodecType_STAC9700)
 {
+#ifdef VBOX_WITH_ARMV8_HARDCODED_DEFAULTS
+    unconst(mGraphicsControllerType)    = GraphicsControllerType_VMSVGA;
+    unconst(mVRAMSize)                  = 128; /* MB */
+# ifdef VBOX_WITH_E1000
+    unconst(mNetworkAdapterType)        = NetworkAdapterType_I82540EM;
+# endif
+    unconst(mNumSerialEnabled)          = 1;
+    unconst(mDVDStorageControllerType)  = StorageControllerType_VirtioSCSI;
+    unconst(mDVDStorageBusType)         = StorageBus_VirtioSCSI;
+    unconst(mHDStorageControllerType)   = StorageControllerType_VirtioSCSI;
+    unconst(mHDStorageBusType)          = StorageBus_VirtioSCSI;
+    unconst(mChipsetType)               = ChipsetType_ARMv8Virtual;
+#endif /* VBOX_WITH_ARMV8_HARDCODED_DEFAULTS */
 }
 
@@ -106 +119 @@
     unconst(mRAMSize)                   = ostype.recommendedRAM;
     unconst(mCPUCount)                  = ostype.recommendedCPUCount;
+    unconst(mHDDSize)                   = ostype.recommendedHDD;
+#ifndef VBOX_WITH_ARMV8_HARDCODED_DEFAULTS
     unconst(mGraphicsControllerType)    = ostype.graphicsControllerType;
     unconst(mVRAMSize)                  = ostype.recommendedVRAM;
-    unconst(mHDDSize)                   = ostype.recommendedHDD;
     unconst(mNetworkAdapterType)        = ostype.networkAdapterType;
     unconst(mNumSerialEnabled)          = ostype.numSerialEnabled;
@@ -116 +130 @@
     unconst(mHDStorageBusType)          = ostype.hdStorageBusType;
     unconst(mChipsetType)               = ostype.chipsetType;
+#endif
     unconst(mIommuType)                 = ostype.iommuType;
     unconst(mAudioControllerType)       = ostype.audioControllerType;

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

@@ -506 +506 @@
         hrc = mNvramStore->i_updateEncryptionSettings(strNVRAMKeyId, strNVRAMKeyStore);
 #endif
+
+#ifdef VBOX_WITH_ARMV8_HARDCODED_DEFAULTS
+        /* At least one serial port has to be enabled. */
+        char szPathTemp[RTPATH_MAX];
+        int vrc = RTPathTemp(szPathTemp, sizeof(szPathTemp)); /* Don't clutter the VM directory; instead use the temp dir. */
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = RTPathAppend(szPathTemp, sizeof(szPathTemp), strName.c_str());
+            if (RT_SUCCESS(vrc))
+            {
+                vrc = RTStrCat(szPathTemp, sizeof(szPathTemp), "-serialPort0");
+                if (RT_SUCCESS(vrc))
+                {
+                    mSerialPorts[0]->COMSETTER(Path)(Bstr(szPathTemp).raw()); /* Must be set first. */
+                    mSerialPorts[0]->COMSETTER(HostMode)(PortMode_RawFile);
+                    mSerialPorts[0]->COMSETTER(Enabled)(TRUE);
+                }
+            }
+        }
+        /* Always needs EFI. */
+        mFirmwareSettings->COMSETTER(FirmwareType)(FirmwareType_EFI);
+        /* Needs VMSVGA for now. */
+        mGraphicsAdapter->COMSETTER(GraphicsControllerType)(GraphicsControllerType_VMSVGA);
+        mGraphicsAdapter->COMSETTER(VRAMSize)(128 /* MB */);
+#endif /* VBOX_WITH_ARMV8_HARDCODED_DEFAULTS */
+
         if (SUCCEEDED(hrc))
         {
@@ -15241 +15267 @@
         mNetworkAdapters[slot]->i_applyDefaults(osType);
 
+#ifdef VBOX_WITH_ARMV8_HARDCODED_DEFAULTS
+        /* Configuration is done in Machine::init(). */
+#else
     /* Apply serial port defaults */
     for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); ++slot)
         mSerialPorts[slot]->i_applyDefaults(osType);
+#endif
 
     /* Apply parallel port defaults  - not OS dependent*/
@@ -15335 +15365 @@
     else if (dvdStorageControllerType == StorageControllerType_IntelAhci)
         storageController->COMSETTER(PortCount)(1);
+
+#ifdef VBOX_WITH_ARMV8_HARDCODED_DEFAULTS
+    /* ARM VMs only support VirtioSCSI for now -- set two ports here, one for HDD and one for DVD drive. */
+    if (hdStorageControllerType == StorageControllerType_VirtioSCSI)
+    {
+        hrc = storageController->COMSETTER(PortCount)(2);
+        if (FAILED(hrc)) return hrc;
+    }
+#endif
 
     /* USB stuff */