Changeset 101459 in vbox for trunk/src

Timestamp:

Oct 17, 2023 8:26:12 AM (19 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

159528

Message:

Main/ConsoleImpl: Move the VMM device configuration out of the x86 config constructor into a separate method in order to be able to use it from the Armv8 variant later on, bugref:10528

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImplConfigCommon.cpp (modified) (2 diffs)
• src-client/ConsoleImplConfigX86.cpp (modified) (5 diffs)

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

@@ -838 +838 @@
     int i_configAudioCtrl(ComPtr<IVirtualBox> pVBox, ComPtr<IMachine> pMachine, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices,
                           bool fOsXGuest, bool *pfAudioEnabled);
+    int i_configVmmDev(ComPtr<IMachine> pMachine, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices);
 
     static DECLCALLBACK(void) i_vmstateChangeCallback(PUVM pUVM, PCVMMR3VTABLE pVMM, VMSTATE enmState,

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

@@ -48 +48 @@
 #include "NvramStoreImpl.h"
 #include "BusAssignmentManager.h"
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+# include "GuestShClPrivate.h"
+#endif
 #ifdef VBOX_WITH_DRAG_AND_DROP
 # include "GuestImpl.h"
@@ -3817 +3820 @@
 }
 
+
+int Console::i_configVmmDev(ComPtr<IMachine> pMachine, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices)
+{
+    VMMDev *pVMMDev = m_pVMMDev; Assert(pVMMDev);
+
+    int vrc = VINF_SUCCESS;
+    PCFGMNODE pDev = NULL;          /* /Devices/Dev/ */
+    PCFGMNODE pInst = NULL;         /* /Devices/Dev/0/ */
+    PCFGMNODE pCfg = NULL;          /* /Devices/Dev/.../Config/ */
+    PCFGMNODE pLunL0 = NULL;        /* /Devices/Dev/0/LUN#0/ */
+
+    /*
+     * VMM Device
+     */
+    InsertConfigNode(pDevices, "VMMDev", &pDev);
+    InsertConfigNode(pDev,     "0", &pInst);
+    InsertConfigNode(pInst,    "Config", &pCfg);
+    InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
+    HRESULT hrc = pBusMgr->assignPCIDevice("VMMDev", pInst);                            H();
+
+    Bstr hwVersion;
+    hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam());                 H();
+    if (hwVersion.compare(Bstr("1").raw()) == 0) /* <= 2.0.x */
+        InsertConfigInteger(pCfg, "HeapEnabled", 0);
+    Bstr snapshotFolder;
+    hrc = pMachine->COMGETTER(SnapshotFolder)(snapshotFolder.asOutParam());             H();
+    InsertConfigString(pCfg, "GuestCoreDumpDir", snapshotFolder);
+
+    /* the VMM device's Main driver */
+    InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+    InsertConfigString(pLunL0, "Driver",               "HGCM");
+    InsertConfigNode(pLunL0,   "Config", &pCfg);
+
+    /*
+     * Attach the status driver.
+     */
+    i_attachStatusDriver(pInst, DeviceType_SharedFolder);
+
+#ifdef VBOX_WITH_SHARED_CLIPBOARD
+    /*
+     * Shared Clipboard.
+     */
+    {
+        ClipboardMode_T enmClipboardMode = ClipboardMode_Disabled;
+        hrc = pMachine->COMGETTER(ClipboardMode)(&enmClipboardMode); H();
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+        BOOL fFileTransfersEnabled;
+        hrc = pMachine->COMGETTER(ClipboardFileTransfersEnabled)(&fFileTransfersEnabled); H();
+#endif
+
+        /* Load the service */
+        vrc = pVMMDev->hgcmLoadService("VBoxSharedClipboard", "VBoxSharedClipboard");
+        if (RT_SUCCESS(vrc))
+        {
+            LogRel(("Shared Clipboard: Service loaded\n"));
+
+            /* Set initial clipboard mode. */
+            vrc = i_changeClipboardMode(enmClipboardMode);
+            AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial clipboard mode (%d): vrc=%Rrc\n",
+                                             enmClipboardMode, vrc));
+
+            /* Setup the service. */
+            VBOXHGCMSVCPARM parm;
+            HGCMSvcSetU32(&parm, !i_useHostClipboard());
+            vrc = pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHCL_HOST_FN_SET_HEADLESS, 1, &parm);
+            AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial headless mode (%RTbool): vrc=%Rrc\n",
+                                             !i_useHostClipboard(), vrc));
+
+# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+            vrc = i_changeClipboardFileTransferMode(RT_BOOL(fFileTransfersEnabled));
+            AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial file transfer mode (%u): vrc=%Rrc\n",
+                                             fFileTransfersEnabled, vrc));
+# endif
+            GuestShCl::createInstance(this /* pConsole */);
+            vrc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtShCl, "VBoxSharedClipboard",
+                                                   &GuestShCl::hgcmDispatcher,
+                                                   GuestShClInst());
+            if (RT_FAILURE(vrc))
+                Log(("Cannot register VBoxSharedClipboard extension, vrc=%Rrc\n", vrc));
+        }
+        else
+            LogRel(("Shared Clipboard: Not available, vrc=%Rrc\n", vrc));
+        vrc = VINF_SUCCESS;  /* None of the potential failures above are fatal. */
+    }
+#endif /* VBOX_WITH_SHARED_CLIPBOARD */
+
+    /*
+     * HGCM HostChannel.
+     */
+    {
+        Bstr value;
+        hrc = pMachine->GetExtraData(Bstr("HGCM/HostChannel").raw(),
+                                     value.asOutParam());
+
+        if (   hrc   == S_OK
+            && value == "1")
+        {
+            vrc = pVMMDev->hgcmLoadService("VBoxHostChannel", "VBoxHostChannel");
+            if (RT_FAILURE(vrc))
+            {
+                LogRel(("VBoxHostChannel is not available, vrc=%Rrc\n", vrc));
+                /* That is not a fatal failure. */
+                vrc = VINF_SUCCESS;
+            }
+        }
+    }
+
+#ifdef VBOX_WITH_DRAG_AND_DROP
+    /*
+     * Drag and Drop.
+     */
+    {
+        DnDMode_T enmMode = DnDMode_Disabled;
+        hrc = pMachine->COMGETTER(DnDMode)(&enmMode);                                   H();
+
+        /* Load the service */
+        vrc = pVMMDev->hgcmLoadService("VBoxDragAndDropSvc", "VBoxDragAndDropSvc");
+        if (RT_FAILURE(vrc))
+        {
+            LogRel(("Drag and drop service is not available, vrc=%Rrc\n", vrc));
+            /* That is not a fatal failure. */
+            vrc = VINF_SUCCESS;
+        }
+        else
+        {
+            vrc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtDragAndDrop, "VBoxDragAndDropSvc",
+                                                   &GuestDnD::notifyDnDDispatcher,
+                                                   GuestDnDInst());
+            if (RT_FAILURE(vrc))
+                Log(("Cannot register VBoxDragAndDropSvc extension, vrc=%Rrc\n", vrc));
+            else
+            {
+                LogRel(("Drag and drop service loaded\n"));
+                vrc = i_changeDnDMode(enmMode);
+            }
+        }
+    }
+#endif /* VBOX_WITH_DRAG_AND_DROP */
+
+    return vrc;
+}
+
 #undef H
 #undef VRC

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

@@ -47 +47 @@
 #include "DisplayImpl.h"
 #include "NvramStoreImpl.h"
-#ifdef VBOX_WITH_SHARED_CLIPBOARD
-# include "GuestShClPrivate.h"
-#endif
-#ifdef VBOX_WITH_DRAG_AND_DROP
-# include "GuestImpl.h"
-# include "GuestDnDPrivate.h"
-#endif
 #include "PlatformImpl.h"
 #include "VMMDev.h"
@@ -95 +88 @@
 #include <VBox/vmm/gcm.h>
 #include <VBox/version.h>
-#ifdef VBOX_WITH_SHARED_CLIPBOARD
-# include <VBox/HostServices/VBoxClipboardSvc.h>
-#endif
 #ifdef VBOX_WITH_GUEST_PROPS
 # include <VBox/HostServices/GuestPropertySvc.h>
@@ -472 +462 @@
 {
     RT_NOREF(pVM /* when everything is disabled */);
-    VMMDev         *pVMMDev   = m_pVMMDev; Assert(pVMMDev);
     ComPtr<IMachine> pMachine = i_machine();
 
@@ -2679 +2668 @@
         }
 
-        /*
-         * VMM Device
-         */
-        InsertConfigNode(pDevices, "VMMDev", &pDev);
-        InsertConfigNode(pDev,     "0", &pInst);
-        InsertConfigNode(pInst,    "Config", &pCfg);
-        InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        hrc = pBusMgr->assignPCIDevice("VMMDev", pInst);                                    H();
-
-        Bstr hwVersion;
-        hrc = pMachine->COMGETTER(HardwareVersion)(hwVersion.asOutParam());                 H();
-        if (hwVersion.compare(Bstr("1").raw()) == 0) /* <= 2.0.x */
-            InsertConfigInteger(pCfg, "HeapEnabled", 0);
-        Bstr snapshotFolder;
-        hrc = pMachine->COMGETTER(SnapshotFolder)(snapshotFolder.asOutParam());             H();
-        InsertConfigString(pCfg, "GuestCoreDumpDir", snapshotFolder);
-
-        /* the VMM device's Main driver */
-        InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-        InsertConfigString(pLunL0, "Driver",               "HGCM");
-        InsertConfigNode(pLunL0,   "Config", &pCfg);
-
-        /*
-         * Attach the status driver.
-         */
-        i_attachStatusDriver(pInst, DeviceType_SharedFolder);
+        vrc = i_configVmmDev(pMachine, pBusMgr, pDevices);                                      VRC();
 
         /*
@@ -2712 +2676 @@
         vrc = i_configAudioCtrl(virtualBox, pMachine, pBusMgr, pDevices,
                                 fOsXGuest, &fAudioEnabled);                                     VRC();
-
-#ifdef VBOX_WITH_SHARED_CLIPBOARD
-        /*
-         * Shared Clipboard.
-         */
-        {
-            ClipboardMode_T enmClipboardMode = ClipboardMode_Disabled;
-            hrc = pMachine->COMGETTER(ClipboardMode)(&enmClipboardMode); H();
-# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            BOOL fFileTransfersEnabled;
-            hrc = pMachine->COMGETTER(ClipboardFileTransfersEnabled)(&fFileTransfersEnabled); H();
-#endif
-
-            /* Load the service */
-            vrc = pVMMDev->hgcmLoadService("VBoxSharedClipboard", "VBoxSharedClipboard");
-            if (RT_SUCCESS(vrc))
-            {
-                LogRel(("Shared Clipboard: Service loaded\n"));
-
-                /* Set initial clipboard mode. */
-                vrc = i_changeClipboardMode(enmClipboardMode);
-                AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial clipboard mode (%d): vrc=%Rrc\n",
-                                                 enmClipboardMode, vrc));
-
-                /* Setup the service. */
-                VBOXHGCMSVCPARM parm;
-                HGCMSvcSetU32(&parm, !i_useHostClipboard());
-                vrc = pVMMDev->hgcmHostCall("VBoxSharedClipboard", VBOX_SHCL_HOST_FN_SET_HEADLESS, 1, &parm);
-                AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial headless mode (%RTbool): vrc=%Rrc\n",
-                                                 !i_useHostClipboard(), vrc));
-
-# ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-                vrc = i_changeClipboardFileTransferMode(RT_BOOL(fFileTransfersEnabled));
-                AssertLogRelMsg(RT_SUCCESS(vrc), ("Shared Clipboard: Failed to set initial file transfer mode (%u): vrc=%Rrc\n",
-                                                 fFileTransfersEnabled, vrc));
-# endif
-                GuestShCl::createInstance(this /* pConsole */);
-                vrc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtShCl, "VBoxSharedClipboard",
-                                                       &GuestShCl::hgcmDispatcher,
-                                                       GuestShClInst());
-                if (RT_FAILURE(vrc))
-                    Log(("Cannot register VBoxSharedClipboard extension, vrc=%Rrc\n", vrc));
-            }
-            else
-                LogRel(("Shared Clipboard: Not available, vrc=%Rrc\n", vrc));
-            vrc = VINF_SUCCESS;  /* None of the potential failures above are fatal. */
-        }
-#endif /* VBOX_WITH_SHARED_CLIPBOARD */
-
-        /*
-         * HGCM HostChannel.
-         */
-        {
-            Bstr value;
-            hrc = pMachine->GetExtraData(Bstr("HGCM/HostChannel").raw(),
-                                         value.asOutParam());
-
-            if (   hrc   == S_OK
-                && value == "1")
-            {
-                vrc = pVMMDev->hgcmLoadService("VBoxHostChannel", "VBoxHostChannel");
-                if (RT_FAILURE(vrc))
-                {
-                    LogRel(("VBoxHostChannel is not available, vrc=%Rrc\n", vrc));
-                    /* That is not a fatal failure. */
-                    vrc = VINF_SUCCESS;
-                }
-            }
-        }
-
-#ifdef VBOX_WITH_DRAG_AND_DROP
-        /*
-         * Drag and Drop.
-         */
-        {
-            DnDMode_T enmMode = DnDMode_Disabled;
-            hrc = pMachine->COMGETTER(DnDMode)(&enmMode);                                   H();
-
-            /* Load the service */
-            vrc = pVMMDev->hgcmLoadService("VBoxDragAndDropSvc", "VBoxDragAndDropSvc");
-            if (RT_FAILURE(vrc))
-            {
-                LogRel(("Drag and drop service is not available, vrc=%Rrc\n", vrc));
-                /* That is not a fatal failure. */
-                vrc = VINF_SUCCESS;
-            }
-            else
-            {
-                vrc = HGCMHostRegisterServiceExtension(&m_hHgcmSvcExtDragAndDrop, "VBoxDragAndDropSvc",
-                                                       &GuestDnD::notifyDnDDispatcher,
-                                                       GuestDnDInst());
-                if (RT_FAILURE(vrc))
-                    Log(("Cannot register VBoxDragAndDropSvc extension, vrc=%Rrc\n", vrc));
-                else
-                {
-                    LogRel(("Drag and drop service loaded\n"));
-                    vrc = i_changeDnDMode(enmMode);
-                }
-            }
-        }
-#endif /* VBOX_WITH_DRAG_AND_DROP */
 
 #if defined(VBOX_WITH_TPM)