Changeset 101200 in vbox for trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp

Timestamp:

Sep 20, 2023 2:14:26 PM (17 months ago)

Author:

vboxsync

Message:

Main,FE/Qt: Add the QEMU RAM based framebuffer device as a possible graphics controller for ARM platforms. Allows getting graphics output on guests like OpenSuse 15.4 and Oracle Linux 9 which don't have a compatible VSVGA3 device driver, bugref:10386

File:

• trunk/src/VBox/Main/src-client/ConsoleImplConfigArmV8.cpp (modified) (3 diffs)

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

@@ -413 +413 @@
 
         /*
+         * VGA.
+         */
+        ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+        hrc = pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());           H();
+        GraphicsControllerType_T enmGraphicsController;
+        hrc = pGraphicsAdapter->COMGETTER(GraphicsControllerType)(&enmGraphicsController);   H();
+
+        /*
          * Devices
          */
@@ -482 +490 @@
         InsertConfigInteger(pCfg,  "MmioBase", 0x09020000);
         InsertConfigInteger(pCfg,  "DmaEnabled",        1);
-        InsertConfigInteger(pCfg,  "QemuRamfbSupport",  0);
-        InsertConfigNode(pInst,    "LUN#0",           &pLunL0);
-        InsertConfigString(pLunL0, "Driver",          "MainDisplay");
+        InsertConfigInteger(pCfg,  "QemuRamfbSupport",  enmGraphicsController == GraphicsControllerType_QemuRamFB ? 1 : 0);
+        if (enmGraphicsController == GraphicsControllerType_QemuRamFB)
+        {
+            InsertConfigNode(pInst,    "LUN#0",           &pLunL0);
+            InsertConfigString(pLunL0, "Driver",          "MainDisplay");
+        }
 
         vrc = RTFdtNodeAddF(hFdt, "fw-cfg@%RX32", 0x09020000);                              VRC();
@@ -637 +648 @@
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
-        InsertConfigNode(pDevices, "vga", &pDev);
-        InsertConfigNode(pDev,     "0", &pInst);
-        InsertConfigInteger(pInst, "Trusted",           1);
-        InsertConfigInteger(pInst, "PCIBusNo",          0);
-        InsertConfigInteger(pInst, "PCIDeviceNo",       2);
-        InsertConfigInteger(pInst, "PCIFunctionNo",     0);
-        InsertConfigNode(pInst,    "Config", &pCfg);
-        InsertConfigInteger(pCfg,  "VRamSize",          32 * _1M);
-        InsertConfigInteger(pCfg,  "MonitorCount",         1);
-        i_attachStatusDriver(pInst, DeviceType_Graphics3D);
-        InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
-        InsertConfigInteger(pCfg, "VMSVGAPciBarLayout", true);
-        InsertConfigInteger(pCfg, "VMSVGAPciId", true);
-        InsertConfigInteger(pCfg, "VMSVGA3dEnabled", false);
-        InsertConfigInteger(pCfg, "VmSvga3", true);
-        InsertConfigInteger(pCfg, "VmSvgaExposeLegacyVga", false);
-
-        /* Attach the display. */
-        InsertConfigNode(pInst,    "LUN#0", &pLunL0);
-        InsertConfigString(pLunL0, "Driver",               "MainDisplay");
-        InsertConfigNode(pLunL0,   "Config", &pCfg);
-
+        if (   enmGraphicsController != GraphicsControllerType_QemuRamFB
+            && enmGraphicsController != GraphicsControllerType_Null)
+        {
+            InsertConfigNode(pDevices, "vga", &pDev);
+            InsertConfigNode(pDev,     "0", &pInst);
+            InsertConfigInteger(pInst, "Trusted",           1);
+            InsertConfigInteger(pInst, "PCIBusNo",          0);
+            InsertConfigInteger(pInst, "PCIDeviceNo",       2);
+            InsertConfigInteger(pInst, "PCIFunctionNo",     0);
+            InsertConfigNode(pInst,    "Config", &pCfg);
+            InsertConfigInteger(pCfg,  "VRamSize",          32 * _1M);
+            InsertConfigInteger(pCfg,  "MonitorCount",         1);
+            i_attachStatusDriver(pInst, DeviceType_Graphics3D);
+            InsertConfigInteger(pCfg, "VMSVGAEnabled", true);
+            InsertConfigInteger(pCfg, "VMSVGAPciBarLayout", true);
+            InsertConfigInteger(pCfg, "VMSVGAPciId", true);
+            InsertConfigInteger(pCfg, "VMSVGA3dEnabled", false);
+            InsertConfigInteger(pCfg, "VmSvga3", true);
+            InsertConfigInteger(pCfg, "VmSvgaExposeLegacyVga", false);
+
+            /* Attach the display. */
+            InsertConfigNode(pInst,    "LUN#0", &pLunL0);
+            InsertConfigString(pLunL0, "Driver",               "MainDisplay");
+            InsertConfigNode(pLunL0,   "Config", &pCfg);
+        }
 
         InsertConfigNode(pDevices, "VMMDev",          &pDev);