diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-04-01 13:12:28 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-04-01 13:12:28 +0000 |
| commit | f80bbf4eae8a552267e8b7ece69ba3635891466f (patch) | |
| tree | f47c173445d8627fa9b7d480fbdef00d9e20b506 /src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp | |
| parent | 6ff4f61b4f31674cd467bd5fb81ec72c1c1edc81 (diff) | |
| download | VirtualBox-svn-f80bbf4eae8a552267e8b7ece69ba3635891466f.tar.gz | |
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.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@88345 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp')
| -rw-r--r-- | src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp index 103e17a837d..5934564f39f 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp @@ -235,7 +235,7 @@ enum MODIFYVM_RECORDING_OPTIONS, #endif MODIFYVM_CHIPSET, -#ifdef VBOX_WITH_IOMMU_AMD +#if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL) MODIFYVM_IOMMU, #endif MODIFYVM_DEFAULTFRONTEND, @@ -411,7 +411,7 @@ static const RTGETOPTDEF g_aModifyVMOptions[] = { "--iocache", MODIFYVM_IOCACHE, RTGETOPT_REQ_BOOL_ONOFF }, { "--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 #ifdef VBOX_WITH_RECORDING @@ -3012,7 +3012,7 @@ RTEXITCODE handleModifyVM(HandlerArg *a) } break; } -#ifdef VBOX_WITH_IOMMU_AMD +#if defined(VBOX_WITH_IOMMU_AMD) || defined(VBOX_WITH_IOMMU_INTEL) case MODIFYVM_IOMMU: { if ( !RTStrICmp(ValueUnion.psz, "none") @@ -3020,12 +3020,15 @@ RTEXITCODE handleModifyVM(HandlerArg *a) CHECK_ERROR(sessionMachine, COMSETTER(IommuType)(IommuType_None)); 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 { |