Changeset 102599 in vbox

Timestamp:

Dec 14, 2023 4:03:06 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10543: A bit of fixes for Runtime UI to acquire real machine architecture instead of using x86.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (1 diff)
• UIMachine.h (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp

@@ -258 +258 @@
 {
     return uisession()->acquireUserMachineIcon(icon);
+}
+
+bool UIMachine::acquireArchitectureType(KPlatformArchitecture &enmType)
+{
+    return uisession()->acquireArchitectureType(enmType);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -203 +203 @@
         void acquireUserMachineIcon(QIcon &icon);
 
+        /** Acquires architecture type. */
+        bool acquireArchitectureType(KPlatformArchitecture &enmType);
         /** Acquires chipset type. */
         bool acquireChipsetType(KChipsetType &enmType);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -2666 +2666 @@
 {
     /* Determine how many adapters we should display: */
+    KPlatformArchitecture enmArchType = KPlatformArchitecture_None;
+    uimachine()->acquireArchitectureType(enmArchType);
     KChipsetType enmChipsetType = KChipsetType_Null;
     uimachine()->acquireChipsetType(enmChipsetType);
-    CPlatformProperties comProperties = uiCommon().virtualBox().GetPlatformProperties(KPlatformArchitecture_x86);
+    CPlatformProperties comProperties = uiCommon().virtualBox().GetPlatformProperties(enmArchType);
     const ulong uCount = qMin((ulong)4, (ulong)comProperties.GetMaxNetworkAdapters(enmChipsetType));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -300 +300 @@
 }
 
+bool UISession::acquireArchitectureType(KPlatformArchitecture &enmType)
+{
+    CMachine comMachine = machine();
+    if (comMachine.isNull())
+        return false;
+    CPlatform comPlatform = comMachine.GetPlatform();
+    const KPlatformArchitecture enmArchType = comPlatform.GetArchitecture();
+    const bool fSuccess = comMachine.isOk();
+    if (!fSuccess)
+        UINotificationMessage::cannotAcquireMachineParameter(comMachine);
+    else
+        enmType = enmArchType;
+    return fSuccess;
+}
+
 bool UISession::acquireChipsetType(KChipsetType &enmType)
 {
@@ -1245 +1260 @@
 bool UISession::acquireWhetherAtLeastOneNetworkAdapterEnabled(bool &fEnabled)
 {
-    /* Acquire system properties: */
-    CVirtualBox comVBox = uiCommon().virtualBox();
-    AssertReturn(comVBox.isNotNull(), false);
-    CPlatformProperties comProperties = comVBox.GetPlatformProperties(KPlatformArchitecture_x86);
-    if (!comVBox.isOk())
-    {
-        UINotificationMessage::cannotAcquireVirtualBoxParameter(comVBox);
-        return false;
-    }
-
-    /* Acquire chipset type: */
-    KChipsetType enmChipsetType = KChipsetType_Null;
-    bool fSuccess = acquireChipsetType(enmChipsetType);
-    if (fSuccess)
-    {
-        /* Acquire maximum network adapters count: */
-        const ulong uSlots = comProperties.GetMaxNetworkAdapters(enmChipsetType);
-        fSuccess = comProperties.isOk();
+    /* Acquire architecture type: */
+    KPlatformArchitecture enmArchType = KPlatformArchitecture_None;
+    bool fSuccess = acquireArchitectureType(enmArchType);
+    {
+        /* Acquire system properties: */
+        CVirtualBox comVBox = uiCommon().virtualBox();
+        AssertReturn(comVBox.isNotNull(), false);
+        CPlatformProperties comProperties = comVBox.GetPlatformProperties(enmArchType);
+        fSuccess = comVBox.isOk();
         if (!fSuccess)
-            UINotificationMessage::cannotAcquirePlatformPropertiesParameter(comProperties);
+            UINotificationMessage::cannotAcquireVirtualBoxParameter(comVBox);
         else
         {
-            /* Search for 1st enabled adapter: */
-            for (ulong uSlot = 0; uSlot < uSlots; ++uSlot)
-            {
-                bool fAdapterEnabled = false;
-                fSuccess = acquireWhetherNetworkAdapterEnabled(uSlot, fAdapterEnabled);
+            /* Acquire chipset type: */
+            KChipsetType enmChipsetType = KChipsetType_Null;
+            fSuccess = acquireChipsetType(enmChipsetType);
+            if (fSuccess)
+            {
+                /* Acquire maximum network adapters count: */
+                const ulong cMaxNetworkAdapters = comProperties.GetMaxNetworkAdapters(enmChipsetType);
+                fSuccess = comProperties.isOk();
                 if (!fSuccess)
-                    break;
-                if (!fAdapterEnabled)
-                    continue;
-                fEnabled = true;
-                break;
+                    UINotificationMessage::cannotAcquirePlatformPropertiesParameter(comProperties);
+                else
+                {
+                    /* Search for 1st enabled adapter: */
+                    for (ulong uSlot = 0; uSlot < cMaxNetworkAdapters; ++uSlot)
+                    {
+                        bool fAdapterEnabled = false;
+                        fSuccess = acquireWhetherNetworkAdapterEnabled(uSlot, fAdapterEnabled);
+                        if (!fSuccess)
+                            break;
+                        if (!fAdapterEnabled)
+                            continue;
+                        fEnabled = true;
+                        break;
+                    }
+                }
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -201 +201 @@
         void acquireUserMachineIcon(QIcon &icon);
 
+        /** Acquires architecture type. */
+        bool acquireArchitectureType(KPlatformArchitecture &enmType);
         /** Acquires chipset type. */
         bool acquireChipsetType(KChipsetType &enmType);