Changeset 88345 in vbox for trunk

Timestamp:

Apr 1, 2021 1:12:28 PM (4 years ago)

Author:

vboxsync

Message:

Intel IOMMU: bugref:9967 Main, VBoxManage: Handle Intel IOMMU in places where it's missing. Without VBOX_WITH_IOMMU_INTEL define, it's considered not implemented.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (4 diffs)
• Main/Makefile.kmk (modified) (2 diffs)
• Main/xml/Settings.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -236 +236 @@
 #endif
     MODIFYVM_CHIPSET,
-#ifdef VBOX_WITH_IOMMU_AMD
+#if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
     MODIFYVM_IOMMU,
 #endif
@@ -412 +412 @@
     { "--iocachesize",              MODIFYVM_IOCACHESIZE,               RTGETOPT_REQ_UINT32 },
     { "--chipset",                  MODIFYVM_CHIPSET,                   RTGETOPT_REQ_STRING },
-#ifdef VBOX_WITH_IOMMU_AMD
+#if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
     { "--iommu",                    MODIFYVM_IOMMU,                     RTGETOPT_REQ_STRING },
 #endif
@@ -3013 +3013 @@
                 break;
             }
-#ifdef VBOX_WITH_IOMMU_AMD
+#if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL)
             case MODIFYVM_IOMMU:
             {
@@ -3021 +3021 @@
                 else if (!RTStrICmp(ValueUnion.psz, "amd"))
                     CHECK_ERROR(sessionMachine, COMSETTER(IommuType)(IommuType_AMD));
-                /** @todo Add Intel when it's supported, remove warning from below. */
+                else if (!RTStrICmp(ValueUnion.psz, "intel"))
+                    CHECK_ERROR(sessionMachine, COMSETTER(IommuType)(IommuType_Intel));
                 else if (!RTStrICmp(ValueUnion.psz, "automatic"))
                 {
                     CHECK_ERROR(sessionMachine, COMSETTER(IommuType)(IommuType_Automatic));
+#ifndef VBOX_WITH_IOMMU_INTEL
                     RTStrmPrintf(g_pStdErr,
                                  "Warning: On Intel hosts, 'automatic' will not enable an IOMMU since the Intel IOMMU device is not supported yet.\n");
+#endif
                 }
                 else

trunk/src/VBox/Main/Makefile.kmk

@@ -484 +484 @@
         $(if $(VBOX_WITH_LIBCURL),VBOX_WITH_HOST_UPDATE_CHECK,) \
         $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,) \
         $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_USB
@@ -893 +894 @@
         $(if $(VBOX_WITH_VRDEAUTH_IN_VBOXSVC),VBOX_WITH_VRDEAUTH_IN_VBOXSVC,) \
         $(if $(VBOX_WITH_LIBCURL), VBOX_WITH_PROXY_INFO) \
-        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,)
+        $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \
+        $(if $(VBOX_WITH_IOMMU_INTEL),VBOX_WITH_IOMMU_INTEL,)
 ifdef VBOX_WITH_NETSHAPER
  VBoxC_DEFS += VBOX_WITH_NETSHAPER

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4622 +4622 @@
                 else if (strIommuType == "AMD")
                     hw.iommuType = IommuType_AMD;
+                else if (strIommuType == "Intel")
+                    hw.iommuType = IommuType_Intel;
                 else
                     throw ConfigFileError(this,
@@ -6129 +6131 @@
             case IommuType_Automatic:    pcszIommuType = "Automatic";   break;
             case IommuType_AMD:          pcszIommuType = "AMD";         break;
+            case IommuType_Intel:        pcszIommuType = "Intel";       break;
             default:     Assert(false);  pcszIommuType = "None";        break;
         }