Changeset 93511 in vbox for trunk/src

Timestamp:

Jan 31, 2022 8:25:32 PM (3 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl2.cpp: Look at the CPU profile then the host cpu vendor when resolving IommuType_Automatic, skipping the latter for non-x86 hosts. bugref:9898

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (11 diffs)

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

@@ -841 +841 @@
     }
 
+    /* Get the CPU profile name. */
+    Bstr bstrCpuProfile;
+    hrc = pMachine->COMGETTER(CPUProfile)(bstrCpuProfile.asOutParam());                     H();
+
+    /*
+     * Figure out the IOMMU config.
+     */
 #if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
-    IommuType_T iommuType;
-    hrc = pMachine->COMGETTER(IommuType)(&iommuType);                                       H();
+    IommuType_T enmIommuType;
+    hrc = pMachine->COMGETTER(IommuType)(&enmIommuType);                                    H();
 
     /* Resolve 'automatic' type to an Intel or AMD IOMMU based on the host CPU. */
-    if (iommuType == IommuType_Automatic)
+    if (enmIommuType == IommuType_Automatic)
     {
-        if (ASMIsAmdCpu())
-            iommuType = IommuType_AMD;
+        if (   bstrCpuProfile.startsWith("AMD")
+            || bstrCpuProfile.startsWith("Quad-Core AMD")
+            || bstrCpuProfile.startsWith("Hygon"))
+            enmIommuType = IommuType_AMD;
+        else if (bstrCpuProfile.startsWith("Intel"))
+        {
+            if (   bstrCpuProfile.equals("Intel 8086")
+                || bstrCpuProfile.equals("Intel 80186")
+                || bstrCpuProfile.equals("Intel 80286")
+                || bstrCpuProfile.equals("Intel 80386")
+                || bstrCpuProfile.equals("Intel 80486"))
+                enmIommuType = IommuType_None;
+            else
+                enmIommuType = IommuType_Intel;
+        }
+# if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+        else if (ASMIsAmdCpu())
+            enmIommuType = IommuType_AMD;
         else if (ASMIsIntelCpu())
-            iommuType = IommuType_Intel;
+            enmIommuType = IommuType_Intel;
+# endif
         else
         {
             /** @todo Should we handle other CPUs like Shanghai, VIA etc. here? */
             LogRel(("WARNING! Unrecognized CPU type, IOMMU disabled.\n"));
-            iommuType = IommuType_None;
+            enmIommuType = IommuType_None;
         }
     }
 
-    if (iommuType == IommuType_AMD)
+    if (enmIommuType == IommuType_AMD)
     {
-#ifdef VBOX_WITH_IOMMU_AMD
+# ifdef VBOX_WITH_IOMMU_AMD
         /*
          * Reserve the specific PCI address of the "SB I/O APIC" when using
@@ -868 +892 @@
          */
         uIoApicPciAddress = VBOX_PCI_BDF_SB_IOAPIC;
-#else
+# else
         LogRel(("WARNING! AMD IOMMU not supported, IOMMU disabled.\n"));
-        iommuType = IommuType_None;
-#endif
+        enmIommuType = IommuType_None;
+# endif
     }
 
-    if (iommuType == IommuType_Intel)
+    if (enmIommuType == IommuType_Intel)
     {
-#ifdef VBOX_WITH_IOMMU_INTEL
+# ifdef VBOX_WITH_IOMMU_INTEL
         /*
          * Reserve a unique PCI address for the I/O APIC when using
@@ -883 +907 @@
          */
         uIoApicPciAddress = VBOX_PCI_BDF_SB_IOAPIC;
-#else
+# else
         LogRel(("WARNING! Intel IOMMU not supported, IOMMU disabled.\n"));
-        iommuType = IommuType_None;
-#endif
+        enmIommuType = IommuType_None;
+# endif
     }
 
-    if (   iommuType == IommuType_AMD
-        || iommuType == IommuType_Intel)
+    if (   enmIommuType == IommuType_AMD
+        || enmIommuType == IommuType_Intel)
     {
         if (chipsetType != ChipsetType_ICH9)
@@ -900 +924 @@
     }
 #else
-    IommuType_T const iommuType = IommuType_None;
+    IommuType_T const enmIommuType = IommuType_None;
 #endif
-    Assert(iommuType != IommuType_Automatic);
-    BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(pVMM, chipsetType, iommuType);
+
+    /* Instantiate the bus assignment manager. */
+    Assert(enmIommuType != IommuType_Automatic);
+    BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(pVMM, chipsetType, enmIommuType);
 
     ULONG cCpus = 1;
@@ -1079 +1105 @@
 
         /* CPUM profile name. */
-        hrc = pMachine->COMGETTER(CPUProfile)(bstr.asOutParam());                           H();
-        InsertConfigString(pCPUM, "GuestCpuName", bstr);
+        InsertConfigString(pCPUM, "GuestCpuName", bstrCpuProfile);
 
         /*
@@ -1088 +1113 @@
          * dead wrong on 8086 (see http://www.os2museum.com/wp/undocumented-8086-opcodes/).
          */
-        if (   bstr.equals("Intel 80386") /* just for now */
-            || bstr.equals("Intel 80286")
-            || bstr.equals("Intel 80186")
-            || bstr.equals("Nec V20")
-            || bstr.equals("Intel 8086") )
+        if (   bstrCpuProfile.equals("Intel 80386") /* just for now */
+            || bstrCpuProfile.equals("Intel 80286")
+            || bstrCpuProfile.equals("Intel 80186")
+            || bstrCpuProfile.equals("Nec V20")
+            || bstrCpuProfile.equals("Intel 8086") )
         {
             InsertConfigInteger(pEM, "IemExecutesAll", true);
-            if (!bstr.equals("Intel 80386"))
+            if (!bstrCpuProfile.equals("Intel 80386"))
             {
                 fEnableAPIC = false;
@@ -1591 +1616 @@
 #endif
 
-            if (iommuType == IommuType_AMD)
+            if (enmIommuType == IommuType_AMD)
             {
                 /* AMD IOMMU. */
@@ -1616 +1641 @@
                 hrc = pBusMgr->assignPCIDevice("sb-ioapic", NULL /* pCfg */, PCIAddr, true /*fGuestAddressRequired*/);  H();
             }
-            else if (iommuType == IommuType_Intel)
+            else if (enmIommuType == IommuType_Intel)
             {
                 /* Intel IOMMU. */
@@ -1774 +1799 @@
                 InsertConfigNode(pInst,    "Config", &pCfg);
                 InsertConfigInteger(pCfg,  "NumCPUs", cCpus);
-                if (iommuType == IommuType_Intel)
+                if (enmIommuType == IommuType_AMD)
+                    InsertConfigInteger(pCfg, "PCIAddress", uIoApicPciAddress);
+                else if (enmIommuType == IommuType_Intel)
                 {
                     InsertConfigString(pCfg, "ChipType", "DMAR");
                     InsertConfigInteger(pCfg, "PCIAddress", uIoApicPciAddress);
                 }
-                else if (iommuType == IommuType_AMD)
-                    InsertConfigInteger(pCfg, "PCIAddress", uIoApicPciAddress);
             }
         }
@@ -3509 +3534 @@
                 }
             }
-            if (iommuType == IommuType_AMD)
+            if (enmIommuType == IommuType_AMD)
             {
                 PCIBusAddress Address;
@@ -3527 +3552 @@
                 }
             }
-            else if (iommuType == IommuType_Intel)
+            else if (enmIommuType == IommuType_Intel)
             {
                 PCIBusAddress Address;