Index: /trunk/include/VBox/settings.h =================================================================== --- /trunk/include/VBox/settings.h (revision 87240) +++ /trunk/include/VBox/settings.h (revision 87241) @@ -1144,4 +1144,5 @@ ChipsetType_T chipsetType; // requires settings version 1.11 (VirtualBox 4.0) + IommuType_T iommuType; // requires settings version 1.19 (VirtualBox 6.2) ParavirtProvider_T paravirtProvider; // requires settings version 1.15 (VirtualBox 4.4) com::Utf8Str strParavirtDebug; // requires settings version 1.16 (VirtualBox 5.1) Index: /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (revision 87240) +++ /trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk (revision 87241) @@ -49,4 +49,5 @@ $(if $(VBOX_WITH_SHARED_CLIPBOARD),VBOX_WITH_SHARED_CLIPBOARD) \ $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS) \ + $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD) \ $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA) Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 87240) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 87241) @@ -585,4 +585,7 @@ " [--firmware bios|efi|efi32|efi64]\n" " [--chipset ich9|piix3]\n" +#ifdef VBOX_WITH_IOMMU_AMD + " [--iommu none|automatic|amd]\n" +#endif " [--bioslogofadein on|off]\n" " [--bioslogofadeout on|off]\n" Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 87240) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 87241) @@ -445,4 +445,36 @@ } +#ifdef VBOX_WITH_IOMMU_AMD +static const char *iommuTypeToString(IommuType_T iommuType, VMINFO_DETAILS details) +{ + switch (iommuType) + { + case IommuType_None: + if (details == VMINFO_MACHINEREADABLE) + return "none"; + return "None"; + + case IommuType_Automatic: + if (details == VMINFO_MACHINEREADABLE) + return "automatic"; + return "Automatic"; + + case IommuType_AMD: + if (details == VMINFO_MACHINEREADABLE) + return "amd"; + return "AMD"; + + case IommuType_Intel: + if (details == VMINFO_MACHINEREADABLE) + return "intel"; + return "Intel"; + + default: + if (details == VMINFO_MACHINEREADABLE) + return "unknown"; + return "Unknown"; + } +} +#endif static const char *paravirtProviderToString(ParavirtProvider_T provider, VMINFO_DETAILS details) @@ -918,4 +950,11 @@ SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_UnrestrictedExecution, &f), "vtxux", "VT-x Unrestricted Exec.:"); SHOW_BOOLEAN_METHOD(machine, GetHWVirtExProperty(HWVirtExPropertyType_VirtVmsaveVmload, &f), "virtvmsavevmload", "AMD-V Virt. Vmsave/Vmload:"); + +#ifdef VBOX_WITH_IOMMU_AMD + IommuType_T iommuType; + CHECK_ERROR2I_RET(machine, COMGETTER(IommuType)(&iommuType), hrcCheck); + const char *pszIommuType = iommuTypeToString(iommuType, details); + SHOW_UTF8_STRING("iommu", "IOMMU:", pszIommuType); +#endif ParavirtProvider_T paravirtProvider; Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 87240) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 87241) @@ -235,4 +235,7 @@ #endif MODIFYVM_CHIPSET, +#ifdef VBOX_WITH_IOMMU_AMD + MODIFYVM_IOMMU, +#endif MODIFYVM_DEFAULTFRONTEND, MODIFYVM_VMPROC_PRIORITY @@ -408,4 +411,7 @@ { "--iocachesize", MODIFYVM_IOCACHESIZE, RTGETOPT_REQ_UINT32 }, { "--chipset", MODIFYVM_CHIPSET, RTGETOPT_REQ_STRING }, +#ifdef VBOX_WITH_IOMMU_AMD + { "--iommu", MODIFYVM_IOMMU, RTGETOPT_REQ_STRING }, +#endif #ifdef VBOX_WITH_RECORDING { "--recording", MODIFYVM_RECORDING, RTGETOPT_REQ_BOOL_ONOFF }, @@ -2986,4 +2992,27 @@ break; } +#ifdef VBOX_WITH_IOMMU_AMD + case MODIFYVM_IOMMU: + { + if ( !RTStrICmp(ValueUnion.psz, "none") + || !RTStrICmp(ValueUnion.psz, "disabled")) + 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, "automatic")) + { + CHECK_ERROR(sessionMachine, COMSETTER(IommuType)(IommuType_Automatic)); + RTStrmPrintf(g_pStdErr, + "Warning: On Intel hosts, 'automatic' will not enable an IOMMU since the Intel IOMMU device is not supported yet.\n"); + } + else + { + errorArgument("Invalid --iommu argument '%s'", ValueUnion.psz); + rc = E_FAIL; + } + break; + } +#endif #ifdef VBOX_WITH_RECORDING case MODIFYVM_RECORDING: Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 87240) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 87241) @@ -479,4 +479,5 @@ $(if $(VBOX_WITH_NAT_SERVICE),VBOX_WITH_NAT_SERVICE,) \ $(if $(VBOX_WITH_LIBCURL),VBOX_WITH_HOST_UPDATE_CHECK,) \ + $(if $(VBOX_WITH_IOMMU_AMD),VBOX_WITH_IOMMU_AMD,) \ $(if-expr defined(VBOX_WITH_SDS),VBOX_WITH_SDS,) ifdef VBOX_WITH_USB Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 87240) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 87241) @@ -610,7 +610,12 @@ --> - + + Settings version "1.19", written by VirtualBox 6.2.x. + + - Settings version greater than "1.15", written by a future VirtualBox version. + Settings version greater than "1.19", written by a future VirtualBox version. @@ -5968,7 +5973,29 @@ + + + The IOMMU type. This enumeration represents possible + values for the attribute. + + + No IOMMU is present. + + + No IOMMU is present. + + + An AMD IOMMU. + + + An Intel IOMMU. + + + + + IOMMU type used in this VM. + + @@ -11166,5 +11197,5 @@ name="ISystemProperties" extends="$unknown" - uuid="81c55eb1-d584-41a7-aa0b-08b71cddd773" + uuid="31cdb11d-9bb0-455a-b2ca-a1a5b1177912" wsmap="managed" reservedMethods="4" reservedAttributes="16" @@ -11724,4 +11755,11 @@ + + + Returns an array of officially supported values for enum , + in the sense of what is e.g. worth offering in the VirtualBox GUI. + + + @@ -11929,5 +11967,5 @@ Recommended chipset type. + + + + Recommended IOMMU type. Index: /trunk/src/VBox/Main/include/Global.h =================================================================== --- /trunk/src/VBox/Main/include/Global.h (revision 87240) +++ /trunk/src/VBox/Main/include/Global.h (revision 87241) @@ -82,4 +82,5 @@ const StorageBus_T hdStorageBusType; const ChipsetType_T chipsetType; + const IommuType_T iommuType; const AudioControllerType_T audioControllerType; const AudioCodecType_T audioCodecType; Index: /trunk/src/VBox/Main/include/GuestOSTypeImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestOSTypeImpl.h (revision 87240) +++ /trunk/src/VBox/Main/include/GuestOSTypeImpl.h (revision 87241) @@ -79,4 +79,5 @@ HRESULT getRecommendedRTCUseUTC(BOOL *aRecommendedRTCUseUTC); HRESULT getRecommendedChipset(ChipsetType_T *aChipsetType); + HRESULT getRecommendedIommuType(IommuType_T *aIommuType); HRESULT getRecommendedAudioController(AudioControllerType_T *aAudioController); HRESULT getRecommendedAudioCodec(AudioCodecType_T *aAudioCodec); @@ -105,4 +106,5 @@ const StorageBus_T mHDStorageBusType; const ChipsetType_T mChipsetType; + const IommuType_T mIommuType; const AudioControllerType_T mAudioControllerType; const AudioCodecType_T mAudioCodecType; Index: /trunk/src/VBox/Main/include/MachineImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImpl.h (revision 87240) +++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 87241) @@ -319,4 +319,5 @@ PointingHIDType_T mPointingHIDType; ChipsetType_T mChipsetType; + IommuType_T mIommuType; ParavirtProvider_T mParavirtProvider; Utf8Str mParavirtDebug; @@ -896,4 +897,6 @@ HRESULT getChipsetType(ChipsetType_T *aChipsetType); HRESULT setChipsetType(ChipsetType_T aChipsetType); + HRESULT getIommuType(IommuType_T *aIommuType); + HRESULT setIommuType(IommuType_T aIommuType); HRESULT getSnapshotFolder(com::Utf8Str &aSnapshotFolder); HRESULT setSnapshotFolder(const com::Utf8Str &aSnapshotFolder); Index: /trunk/src/VBox/Main/include/SystemPropertiesImpl.h =================================================================== --- /trunk/src/VBox/Main/include/SystemPropertiesImpl.h (revision 87240) +++ /trunk/src/VBox/Main/include/SystemPropertiesImpl.h (revision 87241) @@ -142,4 +142,5 @@ HRESULT getSupportedStorageControllerTypes(std::vector &aSupportedStorageControllerTypes) RT_OVERRIDE; HRESULT getSupportedChipsetTypes(std::vector &aSupportedChipsetTypes) RT_OVERRIDE; + HRESULT getSupportedIommuTypes(std::vector &aSupportedIommuTypes) RT_OVERRIDE; HRESULT getSupportedVBoxUpdateTargetTypes(std::vector &aSupportedVBoxUpdateTargetTypes) RT_OVERRIDE; HRESULT getVBoxUpdateEnabled(BOOL *aVBoxUpdateEnabled) RT_OVERRIDE; Index: /trunk/src/VBox/Main/src-all/Global.cpp =================================================================== --- /trunk/src/VBox/Main/src-all/Global.cpp (revision 87240) +++ /trunk/src/VBox/Main/src-all/Global.cpp (revision 87241) @@ -33,170 +33,170 @@ VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Other", "Other", "Other_64", "Other/Unknown (64-bit)", VBOXOSTYPE_Unknown_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "Windows31", "Windows 3.1", VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, 32, 4, 1 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Windows", "Microsoft Windows", "Windows95", "Windows 95", VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Windows", "Microsoft Windows", "Windows98", "Windows 98", VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Windows", "Microsoft Windows", "WindowsMe", "Windows ME", VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, 128, 4, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "WindowsNT3x", "Windows NT 3.x", VBOXOSTYPE_WinNT3x, VBOXOSHINT_NOUSB | VBOXOSHINT_FLOPPY, 64, 8, _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_BusLogic, StorageBus_SCSI, - StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Windows", "Microsoft Windows", "WindowsNT4", "Windows NT 4", VBOXOSTYPE_WinNT4, VBOXOSHINT_NOUSB, 128, 16, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Windows", "Microsoft Windows", "Windows2000", "Windows 2000", VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, 168, 16, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "WindowsXP", "Windows XP (32-bit)", VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, 192, 16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82543GC, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "WindowsXP_64", "Windows XP (64-bit)", VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 512, 16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "Windows2003", "Windows 2003 (32-bit)", VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, 512, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82543GC, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "Windows2003_64", "Windows 2003 (64-bit)", VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 512, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "WindowsVista", "Windows Vista (32-bit)", VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, 512, 16, 25 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "WindowsVista_64", "Windows Vista (64-bit)", VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 512, 16, 25 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows2008", "Windows 2008 (32-bit)", VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows2008_64", "Windows 2008 (64-bit)", VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 2048, 16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows7", "Windows 7 (32-bit)", VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, 1024, 16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows7_64", "Windows 7 (64-bit)", VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 2048, 16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows8", "Windows 8 (32-bit)", VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE | VBOXOSHINT_USB3, 1024,128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows8_64", "Windows 8 (64-bit)", VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows81", "Windows 8.1 (32-bit)", VBOXOSTYPE_Win81, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE | VBOXOSHINT_USB3, 1024,128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows81_64", "Windows 8.1 (64-bit)", VBOXOSTYPE_Win81_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64-bit)", VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows10", "Windows 10 (32-bit)", VBOXOSTYPE_Win10, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE | VBOXOSHINT_USB3, 1024,128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows10_64", "Windows 10 (64-bit)", VBOXOSTYPE_Win10_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows2016_64", "Windows 2016 (64-bit)", VBOXOSTYPE_Win2k16_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "Windows2019_64", "Windows 2019 (64-bit)", VBOXOSTYPE_Win2k19_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3, 2048,128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Windows", "Microsoft Windows", "WindowsNT", "Other Windows (32-bit)", VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 512, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Windows", "Microsoft Windows", "WindowsNT_64", "Other Windows (64-bit)", VBOXOSTYPE_WinNT_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 512, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Linux", "Linux", "Linux22", "Linux 2.2", VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, 64, 4, 2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux24", "Linux 2.4 (32-bit)", VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64-bit)", VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux26", "Linux 2.6 / 3.x / 4.x (32-bit)", VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux26_64", "Linux 2.6 / 3.x / 4.x (64-bit)", @@ -204,10 +204,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "ArchLinux", "Arch Linux (32-bit)", VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64-bit)", @@ -215,10 +215,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Debian", "Debian (32-bit)", VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Debian_64", "Debian (64-bit)", @@ -226,10 +226,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980}, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980}, { "Linux", "Linux", "Fedora", "Fedora (32-bit)", VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Fedora_64", "Fedora (64-bit)", @@ -237,10 +237,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Gentoo", "Gentoo (32-bit)", VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Gentoo_64", "Gentoo (64-bit)", @@ -248,10 +248,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Mandriva_64", "Mandriva (64-bit)", @@ -259,10 +259,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Oracle", "Oracle (32-bit)", VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC, 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Oracle_64", "Oracle (64-bit)", @@ -270,10 +270,10 @@ | VBOXOSHINT_X2APIC, 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "RedHat", "Red Hat (32-bit)", VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "RedHat_64", "Red Hat (64-bit)", @@ -281,10 +281,10 @@ | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "OpenSUSE", "openSUSE (32-bit)", VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64-bit)", @@ -292,10 +292,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Turbolinux", "Turbolinux (32-bit)", VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64-bit)", @@ -303,10 +303,10 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Ubuntu", "Ubuntu (32-bit)", VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64-bit)", @@ -314,20 +314,20 @@ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Xandros", "Xandros (32-bit)", VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Xandros_64", "Xandros (64-bit)", VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux", "Other Linux (32-bit)", VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, { "Linux", "Linux", "Linux_64", "Other Linux (64-bit)", @@ -335,90 +335,90 @@ | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)", VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 16, 16 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64-bit)", VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1536, 16, 16 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later (32-bit)", VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, 768, 16, 16 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64-bit)", VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, 1536, 16, 16 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64-bit)", VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_RTCUTC, 1536, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "FreeBSD", "FreeBSD (32-bit)", VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 1024, 16, 2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64-bit)", VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1024, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "OpenBSD", "OpenBSD (32-bit)", VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 1024, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64-bit)", VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 1024, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "NetBSD", "NetBSD (32-bit)", VBOXOSTYPE_NetBSD, VBOXOSHINT_RTCUTC, 1024, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "BSD", "BSD", "NetBSD_64", "NetBSD (64-bit)", VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 1024, 16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 48, 4, 1 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 128, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "OS2", "IBM OS/2", "OS2eCS", "eComStation", VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, 256, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "OS2", "IBM OS/2", "OS21x", "OS/2 1.x", VBOXOSTYPE_OS21x, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET, 8, 4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "OS2", "IBM OS/2", "OS2", "Other OS/2", VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 96, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "MacOS", "Mac OS X", "MacOS", "Mac OS X (32-bit)", @@ -427,5 +427,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64-bit)", @@ -434,5 +434,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS106", "Mac OS X 10.6 Snow Leopard (32-bit)", @@ -441,5 +441,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS106_64", "Mac OS X 10.6 Snow Leopard (64-bit)", @@ -448,5 +448,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS107_64", "Mac OS X 10.7 Lion (64-bit)", @@ -455,5 +455,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS108_64", "Mac OS X 10.8 Mountain Lion (64-bit)", /* Aka "Mountain Kitten". */ VBOXOSTYPE_MacOS108_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT @@ -461,5 +461,5 @@ 2048, 16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS109_64", "Mac OS X 10.9 Mavericks (64-bit)", /* Not to be confused with McCain. */ @@ -468,5 +468,5 @@ 2048, 16, 25 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS1010_64", "Mac OS X 10.10 Yosemite (64-bit)", @@ -475,5 +475,5 @@ 2048, 16, 25 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS1011_64", "Mac OS X 10.11 El Capitan (64-bit)", @@ -482,5 +482,5 @@ 2048, 16, 30 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS1012_64", "macOS 10.12 Sierra (64-bit)", @@ -489,5 +489,5 @@ 2048, 16, 30 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "MacOS", "Mac OS X", "MacOS1013_64", "macOS 10.13 High Sierra (64-bit)", @@ -496,35 +496,35 @@ 2048, 16, 30 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA, AudioCodecType_STAC9221 }, + ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, { "Other", "Other", "DOS", "DOS", VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 32, 4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16, AudioCodecType_SB16 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16 }, { "Other", "Other", "Netware", "Netware", VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, 512, 4, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Other", "Other", "L4", "L4", VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Other", "Other", "QNX", "QNX", VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Other", "Other", "JRockitVE", "JRockitVE", VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, 1024, 4, 8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, { "Other", "Other", "VBoxBS_64", "VirtualBox Bootsector Test (64-bit)", VBOXOSTYPE_VBoxBS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE | VBOXOSHINT_64BIT, 128, 4, 0, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_STAC9700 }, + StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, }; Index: /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp (revision 87240) +++ /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp (revision 87241) @@ -39,4 +39,5 @@ , mHDStorageBusType(StorageBus_IDE) , mChipsetType(ChipsetType_PIIX3) + , mIommuType(IommuType_None) , mAudioControllerType(AudioControllerType_AC97) , mAudioCodecType(AudioCodecType_STAC9700) @@ -103,4 +104,5 @@ unconst(mHDStorageBusType) = ostype.hdStorageBusType; unconst(mChipsetType) = ostype.chipsetType; + unconst(mIommuType) = ostype.iommuType; unconst(mAudioControllerType) = ostype.audioControllerType; unconst(mAudioCodecType) = ostype.audioCodecType; @@ -351,4 +353,13 @@ +HRESULT GuestOSType::getRecommendedIommuType(IommuType_T *aIommuType) +{ + /* IOMMU type is constant during life time, no need to lock */ + *aIommuType = mIommuType; + + return S_OK; +} + + HRESULT GuestOSType::getRecommendedAudioController(AudioControllerType_T *aAudioController) { Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 87240) +++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 87241) @@ -223,4 +223,5 @@ mPointingHIDType = PointingHIDType_PS2Mouse; mChipsetType = ChipsetType_PIIX3; + mIommuType = IommuType_None; mParavirtProvider = ParavirtProvider_Default; mEmulatedUSBCardReaderEnabled = FALSE; @@ -1231,4 +1232,30 @@ } } + } + + return S_OK; +} + +HRESULT Machine::getIommuType(IommuType_T *aIommuType) +{ + AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); + + *aIommuType = mHWData->mIommuType; + + return S_OK; +} + +HRESULT Machine::setIommuType(IommuType_T aIommuType) +{ + AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + + HRESULT rc = i_checkStateDependency(MutableStateDep); + if (FAILED(rc)) return rc; + + if (aIommuType != mHWData->mIommuType) + { + i_setModified(IsModified_MachineData); + mHWData.backup(); + mHWData->mIommuType = aIommuType; } @@ -8755,4 +8782,5 @@ mHWData->mKeyboardHIDType = data.keyboardHIDType; mHWData->mChipsetType = data.chipsetType; + mHWData->mIommuType = data.iommuType; mHWData->mParavirtProvider = data.paravirtProvider; mHWData->mParavirtDebug = data.strParavirtDebug; @@ -10093,4 +10121,7 @@ data.chipsetType = mHWData->mChipsetType; + // iommu + data.iommuType = mHWData->mIommuType; + // paravirt data.paravirtProvider = mHWData->mParavirtProvider; @@ -15116,4 +15147,12 @@ if (FAILED(rc)) return rc; + /* Apply IOMMU defaults. */ + IommuType_T enmIommuType; + rc = osType->COMGETTER(RecommendedIommuType)(&enmIommuType); + if (FAILED(rc)) return rc; + + rc = COMSETTER(IommuType)(enmIommuType); + if (FAILED(rc)) return rc; + /* Apply network adapters defaults */ for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot) Index: /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (revision 87240) +++ /trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (revision 87241) @@ -1813,4 +1813,18 @@ } +HRESULT SystemProperties::getSupportedIommuTypes(std::vector &aSupportedIommuTypes) +{ + static const IommuType_T aIommuTypes[] = + { + IommuType_None, + IommuType_Automatic, + IommuType_AMD, + /** @todo Add Intel when it's supported. */ + }; + aSupportedIommuTypes.assign(aIommuTypes, + aIommuTypes + RT_ELEMENTS(aIommuTypes)); + return S_OK; +} + HRESULT SystemProperties::getSupportedVBoxUpdateTargetTypes(std::vector &aSupportedVBoxUpdateTargetTypes) { Index: /trunk/src/VBox/Main/xml/Settings.cpp =================================================================== --- /trunk/src/VBox/Main/xml/Settings.cpp (revision 87240) +++ /trunk/src/VBox/Main/xml/Settings.cpp (revision 87241) @@ -411,5 +411,7 @@ else if (uMinor == 18) sv = SettingsVersion_v1_18; - else if (uMinor > 18) + else if (uMinor == 19) + sv = SettingsVersion_v1_19; + else if (uMinor > 19) sv = SettingsVersion_Future; } @@ -1043,4 +1045,8 @@ break; + case SettingsVersion_v1_19: + pcszVersion = "1.19"; + break; + default: // catch human error: the assertion below will trigger in debug @@ -1065,6 +1071,6 @@ // but as it's an omission of someone who changed this file // it's the only generic possibility. - pcszVersion = "1.18"; - m->sv = SettingsVersion_v1_18; + pcszVersion = "1.19"; + m->sv = SettingsVersion_v1_19; } break; @@ -3362,4 +3368,5 @@ keyboardHIDType(KeyboardHIDType_PS2Keyboard), chipsetType(ChipsetType_PIIX3), + iommuType(IommuType_None), paravirtProvider(ParavirtProvider_Legacy), // default for old VMs, for new ones it's ParavirtProvider_Default strParavirtDebug(""), @@ -3486,4 +3493,5 @@ && keyboardHIDType == h.keyboardHIDType && chipsetType == h.chipsetType + && iommuType == h.iommuType && paravirtProvider == h.paravirtProvider && strParavirtDebug == h.strParavirtDebug @@ -4601,4 +4609,22 @@ N_("Invalid value '%s' in Chipset/@type"), strChipsetType.c_str()); + } + } + else if (pelmHwChild->nameEquals("Iommu")) + { + Utf8Str strIommuType; + if (pelmHwChild->getAttributeValue("type", strIommuType)) + { + if (strIommuType == "None") + hw.iommuType = IommuType_None; + else if (strIommuType == "Automatic") + hw.iommuType = IommuType_Automatic; + else if (strIommuType == "AMD") + hw.iommuType = IommuType_AMD; + else + throw ConfigFileError(this, + pelmHwChild, + N_("Invalid value '%s' in Iommu/@type"), + strIommuType.c_str()); } } @@ -6092,4 +6118,20 @@ && hw.strParavirtDebug.isNotEmpty()) pelmParavirt->setAttribute("debug", hw.strParavirtDebug); + } + + if ( m->sv >= SettingsVersion_v1_19 + && hw.iommuType != IommuType_None) + { + const char *pcszIommuType; + switch (hw.iommuType) + { + case IommuType_None: pcszIommuType = "None"; break; + case IommuType_Automatic: pcszIommuType = "Automatic"; break; + case IommuType_AMD: pcszIommuType = "AMD"; break; + default: Assert(false); pcszIommuType = "None"; break; + } + + xml::ElementNode *pelmIommu = pelmHardware->createChild("Iommu"); + pelmIommu->setAttribute("type", pcszIommuType); } @@ -7631,4 +7673,14 @@ void MachineConfigFile::bumpSettingsVersionIfNeeded() { + if (m->sv < SettingsVersion_v1_19) + { + // VirtualBox 6.2 adds iommu device. + if (hardwareMachine.iommuType != IommuType_None) + { + m->sv = SettingsVersion_v1_19; + return; + } + } + if (m->sv < SettingsVersion_v1_18) {