Changeset 88345 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143575

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.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (4 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