Changeset 101574 in vbox

Timestamp:

Oct 24, 2023 8:27:38 AM (15 months ago)

Author:

vboxsync

Message:

Main/src-client/ConsoleImplConfigArmv8.cpp: Some cleanups, bugref:10528

File:

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

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

@@ -365 +365 @@
 
         /* Add the resources. */
-        PCFGMNODE pResources = NULL;    /* /Devices/efi-armv8/Config/Resources */
-        PCFGMNODE pRes = NULL;          /* /Devices/efi-armv8/Config/Resources/<Resource> */
+        PCFGMNODE pResources = NULL;    /* /Devices/platform/Config/Resources */
+        PCFGMNODE pRes = NULL;          /* /Devices/platform/Config/Resources/<Resource> */
         InsertConfigString(pCfg,        "ResourceNamespace",     "resources");
         InsertConfigNode(pCfg,          "Resources",             &pResources);
@@ -397 +397 @@
         InsertConfigString(pRes,        "ResourceId",            "VBoxArmV8Desc");
 
-        vrc = RTFdtNodeAddF(hFdt, "platform-bus@%RX32", 0x0c000000);                        VRC();
-        vrc = RTFdtNodePropertyAddU32(     hFdt, "interrupt-parent", idPHandleIntCtrl);     VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "ranges", 4, 0, 0, 0x0c000000, 0x02000000); VRC();
-        vrc = RTFdtNodePropertyAddU32(     hFdt, "#address-cells",   1);                    VRC();
-        vrc = RTFdtNodePropertyAddU32(     hFdt, "#size-cells",      1);                    VRC();
-        vrc = RTFdtNodePropertyAddStringList(hFdt, "compatible",     2,
-                                             "qemu,platform", "simple-bus");                VRC();
-        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
-
+        /*
+         * Configure the interrupt controller.
+         */
         InsertConfigNode(pDevices, "gic",                   &pDev);
         InsertConfigNode(pDev,     "0",                     &pInst);
@@ -438 +432 @@
         vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
 
-
-        InsertConfigNode(pDevices, "qemu-fw-cfg",   &pDev);
-        InsertConfigNode(pDev,     "0",            &pInst);
-        InsertConfigNode(pInst,    "Config",        &pCfg);
-        InsertConfigInteger(pCfg,  "MmioSize",       4096);
-        InsertConfigInteger(pCfg,  "MmioBase", 0x09020000);
-        InsertConfigInteger(pCfg,  "DmaEnabled",        1);
-        InsertConfigInteger(pCfg,  "QemuRamfbSupport",  enmGraphicsController == GraphicsControllerType_QemuRamFB ? 1 : 0);
         if (enmGraphicsController == GraphicsControllerType_QemuRamFB)
         {
+            InsertConfigNode(pDevices, "qemu-fw-cfg",   &pDev);
+            InsertConfigNode(pDev,     "0",            &pInst);
+            InsertConfigNode(pInst,    "Config",        &pCfg);
+            InsertConfigInteger(pCfg,  "MmioSize",       4096);
+            InsertConfigInteger(pCfg,  "MmioBase", 0x09020000);
+            InsertConfigInteger(pCfg,  "DmaEnabled",        1);
+            InsertConfigInteger(pCfg,  "QemuRamfbSupport",  1);
             InsertConfigNode(pInst,    "LUN#0",           &pLunL0);
             InsertConfigString(pLunL0, "Driver",          "MainDisplay");
+
+            vrc = RTFdtNodeAddF(hFdt, "fw-cfg@%RX32", 0x09020000);                          VRC();
+            vrc = RTFdtNodePropertyAddEmpty(   hFdt, "dma-coherent");                       VRC();
+            vrc = RTFdtNodePropertyAddCellsU32(hFdt, "reg", 4, 0, 0x09020000, 0, 0x18);     VRC();
+            vrc = RTFdtNodePropertyAddString(  hFdt, "compatible", "qemu,fw-cfg-mmio");     VRC();
+            vrc = RTFdtNodeFinalize(hFdt);                                                  VRC();
         }
-
-        vrc = RTFdtNodeAddF(hFdt, "fw-cfg@%RX32", 0x09020000);                              VRC();
-        vrc = RTFdtNodePropertyAddEmpty(   hFdt, "dma-coherent");                           VRC();
-        vrc = RTFdtNodePropertyAddCellsU32(hFdt, "reg", 4, 0, 0x09020000, 0, 0x18);         VRC();
-        vrc = RTFdtNodePropertyAddString(  hFdt, "compatible", "qemu,fw-cfg-mmio");         VRC();
-        vrc = RTFdtNodeFinalize(hFdt);                                                      VRC();
-
 
         InsertConfigNode(pDevices, "flash-cfi",         &pDev);