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

Timestamp:

May 22, 2023 6:36:24 PM (21 months ago)

Author:

vboxsync

Message:

Main/src-client/ConsoleImpl: Add some _very_ basic config code to run an ARMv8 based guest inside the main VirtualBox frontend, can be activated by a CFGM key, bugref:10384

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImplConfigArmV8.cpp (added)
• src-client/ConsoleImplConfigCommon.cpp (modified) (2 diffs)
• src-client/ConsoleImplConfigX86.cpp (modified) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -1024 +1024 @@
         $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,) \
         $(if $(VBOX_WITH_TPM),VBOX_WITH_TPM,) \
-        $(if $(VBOX_WITH_FULL_VM_ENCRYPTION),VBOX_WITH_FULL_VM_ENCRYPTION,)
+        $(if $(VBOX_WITH_FULL_VM_ENCRYPTION),VBOX_WITH_FULL_VM_ENCRYPTION,) \
+        $(if $(VBOX_WITH_VIRT_ARMV8),VBOX_WITH_VIRT_ARMV8,)
  ifdef VBOX_WITH_NETSHAPER
   VBoxC_DEFS += VBOX_WITH_NETSHAPER
@@ -1157 +1158 @@
         src-client/ConsoleImplConfigCommon.cpp \
     src-client/ConsoleImplConfigX86.cpp \
+        $(if $(VBOX_WITH_VIRT_ARMV8),src-client/ConsoleImplConfigArmV8.cpp,) \
         src-client/ConsoleImplTeleporter.cpp \
         src-client/ConsoleVRDPServer.cpp \

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

@@ -669 +669 @@
     typedef std::list <ComObjPtr<RemoteUSBDevice> > RemoteUSBDeviceList;
 
-    HRESULT i_loadVMM(void) RT_NOEXCEPT;
+    HRESULT i_loadVMM(const char *pszVMMMod) RT_NOEXCEPT;
     HRESULT i_addVMCaller(bool aQuiet = false, bool aAllowNullVM = false);
     void    i_releaseVMCaller();
@@ -722 +722 @@
     void i_configAudioDriver(IVirtualBox *pVirtualBox, IMachine *pMachine, PCFGMNODE pLUN, const char *pszDriverName,
                              bool fAudioEnabledIn, bool fAudioEnabledOut);
-    int i_configConstructorInnerX86(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock);
+    int i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock);
+    int i_configConstructorX86(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock);
+#ifdef VBOX_WITH_VIRT_ARMV8
+    int i_configConstructorArmV8(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock);
+#endif
     int i_configCfgmOverlay(PCFGMNODE pRoot, IVirtualBox *pVirtualBox, IMachine *pMachine);
     int i_configDumpAPISettingsTweaks(IVirtualBox *pVirtualBox, IMachine *pMachine);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -543 +543 @@
     if (aLockType == LockType_VM)
     {
+        const char *pszVMM = "VBoxVMM";
+
+#ifdef VBOX_WITH_VIRT_ARMV8
+        Bstr value;
+        hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/ArmV8Virt").raw(),
+                                     value.asOutParam());
+        if (   hrc   == S_OK
+            && value == "1")
+            pszVMM = "VBoxVMMArm";
+#endif
+
         /* Load the VMM. We won't continue without it being successfully loaded here. */
-        hrc = i_loadVMM();
+        hrc = i_loadVMM(pszVMM);
         AssertComRCReturnRC(hrc);
 
@@ -7817 +7828 @@
  *
  * @returns COM status.
+ * @param   pszVMMMod       The VMM module to load.
  * @remarks Caller must write lock the console object.
  */
-HRESULT Console::i_loadVMM(void) RT_NOEXCEPT
+HRESULT Console::i_loadVMM(const char *pszVMMMod) RT_NOEXCEPT
 {
     if (   mhModVMM == NIL_RTLDRMOD
@@ -7829 +7841 @@
         RTERRINFOSTATIC ErrInfo;
         RTLDRMOD        hModVMM = NIL_RTLDRMOD;
-        int vrc = SUPR3HardenedLdrLoadAppPriv("VBoxVMM", &hModVMM, RTLDRLOAD_FLAGS_LOCAL, RTErrInfoInitStatic(&ErrInfo));
+        int vrc = SUPR3HardenedLdrLoadAppPriv(pszVMMMod, &hModVMM, RTLDRLOAD_FLAGS_LOCAL, RTErrInfoInitStatic(&ErrInfo));
         if (RT_SUCCESS(vrc))
         {

trunk/src/VBox/Main/src-client/ConsoleImplConfigCommon.cpp

@@ -477 +477 @@
     try
     {
-        vrc = pConsole->i_configConstructorInnerX86(pUVM, pVM, pVMM, &alock);
+        vrc = pConsole->i_configConstructorInner(pUVM, pVM, pVMM, &alock);
     }
     catch (...)
@@ -490 +490 @@
 
     return vrc;
+}
+
+
+/**
+ * Worker for configConstructor.
+ *
+ * @return  VBox status code.
+ * @param   pUVM        The user mode VM handle.
+ * @param   pVM         The cross context VM handle.
+ * @param   pVMM        The VMM vtable.
+ * @param   pAlock      The automatic lock instance.  This is for when we have
+ *                      to leave it in order to avoid deadlocks (ext packs and
+ *                      more).
+ */
+int Console::i_configConstructorInner(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock)
+{
+#ifdef VBOX_WITH_VIRT_ARMV8
+        ComPtr<IMachine> pMachine = i_machine();
+
+        Bstr strArmV8VirtFlag;
+        HRESULT hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/ArmV8Virt").raw(),
+                                             strArmV8VirtFlag.asOutParam());
+        if (   hrc == S_OK
+            && strArmV8VirtFlag == "1")
+            return i_configConstructorArmV8(pUVM, pVM, pVMM, pAlock);
+#endif
+        return i_configConstructorX86(pUVM, pVM, pVMM, pAlock);
 }
 

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -485 +485 @@
  *                      more).
  */
-int Console::i_configConstructorInnerX86(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock)
+int Console::i_configConstructorX86(PUVM pUVM, PVM pVM, PCVMMR3VTABLE pVMM, AutoWriteLock *pAlock)
 {
     RT_NOREF(pVM /* when everything is disabled */);