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

Timestamp:

Jun 1, 2023 6:18:08 PM (20 months ago)

Author:

vboxsync

Message:

Main: Start simple ResourceStore implementation similar to NvramStore but without all the file loading and saving as it will contain only resources created on the fly when the VM is created, bugref:10467

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (1 diff)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/ConsoleImpl.h (modified) (2 diffs)
• include/ResourceStoreImpl.h (added)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/ResourceStoreImpl.cpp (added)
• src-client/VBoxDriversRegister.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -1168 +1168 @@
         src-client/MouseImpl.cpp \
         src-client/RemoteUSBDeviceImpl.cpp \
+        $(if $(VBOX_WITH_VIRT_ARMV8),src-client/ResourceStoreImpl.cpp,) \
         src-client/SessionImpl.cpp \
         src-client/USBDeviceImpl.cpp \

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -6518 +6518 @@
   </interface>
 
+  <interface
+    name="IResourceStore" extends="$unknown"
+    uuid="d96a2540-8aab-4c71-8af9-95379f23b23d"
+    wsmap="managed"
+    >
+
+    <desc>
+      Provides access to resources accessed by various device implementations and created when the VM
+      is started (only the FDT currently). This is not accessible from anywhere right now but just for
+      convenience if required later on.
+    </desc>
+
+    <attribute name="midlDoesNotLikeEmptyInterfaces" readonly="yes" type="boolean"/>
+
+  </interface>
+
   <enum
     name="GraphicsControllerType"

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

@@ -77 +77 @@
 class VMPowerDownTask;
 class NvramStore;
+#ifdef VBOX_WITH_VIRT_ARMV8
+class ResourceStore;
+#endif
 
 #include <iprt/uuid.h>
@@ -1014 +1017 @@
     const ComObjPtr<EmulatedUSB> mEmulatedUSB;
     const ComObjPtr<NvramStore> mptrNvramStore;
+#ifdef VBOX_WITH_VIRT_ARMV8
+    const ComObjPtr<ResourceStore> mptrResourceStore;
+#endif
 
     USBDeviceList mUSBDevices;

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

@@ -88 +88 @@
 #include "EmulatedUSBImpl.h"
 #include "NvramStoreImpl.h"
+#ifdef VBOX_WITH_VIRT_ARMV8
+# include "ResourceStoreImpl.h"
+#endif
 #include "StringifyEnums.h"
 
@@ -558 +561 @@
         AssertComRCReturnRC(hrc);
 
+#ifdef VBOX_WITH_VIRT_ARMV8
+        unconst(mptrResourceStore).createObject();
+        hrc = mptrResourceStore->init(this);
+        AssertComRCReturnRC(hrc);
+#endif
+
         hrc = mMachine->COMGETTER(VRDEServer)(unconst(mVRDEServer).asOutParam());
         AssertComRCReturnRC(hrc);
@@ -869 +878 @@
 
     unconst(mVRDEServer).setNull();
+
+#ifdef VBOX_WITH_VIRT_ARMV8
+    if (mptrResourceStore)
+    {
+        mptrResourceStore->uninit();
+        unconst(mptrResourceStore).setNull();
+    }
+#endif
 
     unconst(mControl).setNull();
@@ -11637 +11654 @@
     }
 
+#ifdef VBOX_WITH_VIRT_ARMV8
+    if (UuidCopy == COM_IIDOF(IResourceStore))
+    {
+        ResourceStore *pResourceStore = static_cast<ResourceStore *>(pConsole->mptrResourceStore);
+        return pResourceStore;
+    }
+#endif
+
     if (UuidCopy == VMMDEV_OID)
         return pConsole->m_pVMMDev;

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

@@ -52 +52 @@
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
 # include "PCIRawDevImpl.h"
+#endif
+#ifdef VBOX_WITH_VIRT_ARMV8
+# include "ResourceStoreImpl.h"
 #endif
 
@@ -120 +123 @@
         return vrc;
 
+#ifdef VBOX_WITH_VIRT_ARMV8
+    vrc = pCallbacks->pfnRegister(pCallbacks, &ResourceStore::DrvReg);
+    if (RT_FAILURE(vrc))
+        return vrc;
+#endif
+
     return VINF_SUCCESS;
 }