VirtualBox

Changeset 101367 in vbox


Ignore:
Timestamp:
Oct 6, 2023 1:08:17 AM (18 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
159370
Message:

Main/Global.cpp: Use macros to compose the x64/x86/arm64/arm32 guest OS IDs so these can easily be changed. bugref:10384

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Main/src-all/Global.cpp

    r101314 r101367  
    4040
    4141
     42#define VBOX_OSTYPE_X86(a_OStype)       VBOXOSTYPE_ ## a_OStype
     43#define VBOX_OSTYPE_X64(a_OStype)       VBOXOSTYPE_ ## a_OStype ## _x64
     44#define VBOX_OSTYPE_ARM32(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _arm32
     45#define VBOX_OSTYPE_ARM64(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _arm64
     46
     47/** @todo r=bird: These macros should move to VBox/cdefs.h or a similarly easily
     48 *        accessible file, so that the GUI can make use of them too. */
     49/* Note: Keep this naming for legacy reasons. Always meant x86 (32-bit). */
     50#define GUEST_OS_ID_STR_X86(a_szOSid)     a_szOSid
     51#if 0 /** @todo r=bird: revert to legacy naming: */
     52#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  "_64"
     53#else
     54#define GUEST_OS_ID_STR_X64(a_szOSid)     a_szOSid  "_x64"
     55#endif
     56/* New since VBox 7.1. */
     57#define GUEST_OS_ID_STR_A32(a_szOSid)     a_szOSid  "_arm32"
     58/* New since VBox 7.1. */
     59#define GUEST_OS_ID_STR_A64(a_szOSid)     a_szOSid  "_arm64"
     60
    4261/* static */
    4362const Global::OSType Global::sOSTypes[] =
     
    5069     *        are still covering the relevant cases.
    5170     * NOTE4: platform support: always define all guest OS types w/o guarding new / different platform architectures
    52       *       with own #defines. If (and how) guest OS types will be reported is decided by the actual Main
    53       *       implementations(s). */
    54     { "Other",   "Other",             "",               "Other",              "Other/Unknown",
     71     *       with own #defines. If (and how) guest OS types will be reported is decided by the actual Main
     72     *       implementations(s).
     73     */
     74    { "Other",   "Other",             "",               GUEST_OS_ID_STR_X86("Other"),           "Other/Unknown",
    5575      VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
    5676      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    5777      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 },
    5878
    59     { "Other",   "Other",             "",               "Other_x64",          "Other/Unknown (64-bit)",
     79    { "Other",   "Other",             "",               GUEST_OS_ID_STR_X64("Other"),           "Other/Unknown (64-bit)",
    6080      VBOXOSTYPE_Unknown_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_PAE | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC,
    6181      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    6282      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 },
    6383
    64     { "Other",   "Other",             "",               "Other_arm64",        "Other/Unknown (ARM 64-bit)",
     84    { "Other",   "Other",             "",               GUEST_OS_ID_STR_A64("Other"),           "Other/Unknown (ARM 64-bit)",
    6585      VBOXOSTYPE_Unknown_arm64,       VBOXOSHINT_64BIT | VBOXOSHINT_EFI,
    6686      1,   1024, 128,  2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI,
    6787      StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_VirtioSound, AudioCodecType_Null },
    6888
    69     { "Windows", "Microsoft Windows", "",               "Windows31",          "Windows 3.1",
     89    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows31"),       "Windows 3.1",
    7090      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
    7191      1,   32,   4,  1 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    7292      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    7393
    74     { "Windows", "Microsoft Windows", "",               "Windows95",          "Windows 95",
     94    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows95"),       "Windows 95",
    7595      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
    7696      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    7797      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    7898
    79     { "Windows", "Microsoft Windows", "",               "Windows98",          "Windows 98",
     99    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows98"),       "Windows 98",
    80100      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
    81101      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    82102      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    83103
    84     { "Windows", "Microsoft Windows", "",               "WindowsMe",          "Windows ME",
     104    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsMe"),       "Windows ME",
    85105      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
    86106      1,  128,   4,  4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    87107      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    88108
    89     { "Windows", "Microsoft Windows", "",               "WindowsNT3x",        "Windows NT 3.x",
     109    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsNT3x"),     "Windows NT 3.x",
    90110      VBOXOSTYPE_WinNT3x,         VBOXOSHINT_NOUSB | VBOXOSHINT_FLOPPY,
    91111      1,   64,   8,  _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_BusLogic, StorageBus_SCSI,
    92112      StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    93113
    94     { "Windows", "Microsoft Windows", "",               "WindowsNT4",         "Windows NT 4",
     114    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsNT4"),      "Windows NT 4",
    95115      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NOUSB,
    96116      1,  128,  16,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    97117      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    98118
    99     { "Windows", "Microsoft Windows", "",               "Windows2000",        "Windows 2000",
     119    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows2000"),     "Windows 2000",
    100120      VBOXOSTYPE_Win2k,           VBOXOSHINT_USBTABLET,
    101121      1,  168,  16,  4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    102122      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    103123
    104     { "Windows", "Microsoft Windows", "",               "WindowsXP",          "Windows XP (32-bit)",
     124    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsXP"),       "Windows XP (32-bit)",
    105125      VBOXOSTYPE_WinXP,           VBOXOSHINT_USBTABLET,
    106126      1,  192,  16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82543GC, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    107127      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    108128
    109     { "Windows", "Microsoft Windows", "",               "WindowsXP_x64",      "Windows XP (64-bit)",
     129    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("WindowsXP"),       "Windows XP (64-bit)",
    110130      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET,
    111131      1,  512,  16, 10 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    112132      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    113133
    114     { "Windows", "Microsoft Windows", "",               "Windows2003",        "Windows 2003 (32-bit)",
     134    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows2003"),     "Windows 2003 (32-bit)",
    115135      VBOXOSTYPE_Win2k3,          VBOXOSHINT_USBTABLET,
    116136      1,  512,  16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82543GC, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    117137      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    118138
    119     { "Windows", "Microsoft Windows", "",               "Windows2003_x64",    "Windows 2003 (64-bit)",
     139    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2003"),     "Windows 2003 (64-bit)",
    120140      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET,
    121141      1,  512,  16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    122142      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    123143
    124     { "Windows", "Microsoft Windows", "",               "WindowsVista",       "Windows Vista (32-bit)",
     144    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsVista"),    "Windows Vista (32-bit)",
    125145      VBOXOSTYPE_WinVista,        VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    126146      1,  512,  16, 25 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    127147      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    128148
    129     { "Windows", "Microsoft Windows", "",               "WindowsVista_x64",   "Windows Vista (64-bit)",
     149    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("WindowsVista"),    "Windows Vista (64-bit)",
    130150      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    131151      1,  512,  16, 25 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    132152      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    133153
    134     { "Windows", "Microsoft Windows", "",               "Windows2008",        "Windows 2008 (32-bit)",
     154    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows2008"),     "Windows 2008 (32-bit)",
    135155      VBOXOSTYPE_Win2k8,          VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    136156      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    137157      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    138158
    139     { "Windows", "Microsoft Windows", "",               "Windows2008_x64",    "Windows 2008 (64-bit)",
     159    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2008"),     "Windows 2008 (64-bit)",
    140160      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    141161      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    142162      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    143163
    144     { "Windows", "Microsoft Windows", "",               "Windows7",           "Windows 7 (32-bit)",
     164    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows7"),        "Windows 7 (32-bit)",
    145165      VBOXOSTYPE_Win7,            VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    146166      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    147167      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    148168
    149     { "Windows", "Microsoft Windows", "",               "Windows7_x64",       "Windows 7 (64-bit)",
     169    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows7"),        "Windows 7 (64-bit)",
    150170      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_WDDM_GRAPHICS,
    151171      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    152172      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    153173
    154     { "Windows", "Microsoft Windows", "",               "Windows8",           "Windows 8 (32-bit)",
     174    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows8"),        "Windows 8 (32-bit)",
    155175      VBOXOSTYPE_Win8,            VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X86_PAE | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    156176      1, 1024, 128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    157177      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    158178
    159     { "Windows", "Microsoft Windows", "",               "Windows8_x64",       "Windows 8 (64-bit)",
     179    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows8"),        "Windows 8 (64-bit)",
    160180      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    161181      1, 2048, 128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    162182      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    163183
    164     { "Windows", "Microsoft Windows", "",               "Windows81",          "Windows 8.1 (32-bit)",
     184    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows81"),       "Windows 8.1 (32-bit)",
    165185      VBOXOSTYPE_Win81,           VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X86_PAE | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    166186      1, 1024, 128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    167187      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    168188
    169     { "Windows", "Microsoft Windows", "",               "Windows81_x64",      "Windows 8.1 (64-bit)",
     189    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows81"),      "Windows 8.1 (64-bit)",
    170190      VBOXOSTYPE_Win81_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    171191      1, 2048, 128, 40 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    172192      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    173193
    174     { "Windows", "Microsoft Windows", "",               "Windows2012_x64",    "Windows 2012 (64-bit)",
     194    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2012"),     "Windows 2012 (64-bit)",
    175195      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    176196      1, 2048, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    177197      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    178198
    179     { "Windows", "Microsoft Windows", "",               "Windows10",          "Windows 10 (32-bit)",
     199    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("Windows10"),       "Windows 10 (32-bit)",
    180200      VBOXOSTYPE_Win10,           VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X86_PAE | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    181201      1, 1024, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    182202      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    183203
    184     { "Windows", "Microsoft Windows", "",               "Windows10_x64",      "Windows 10 (64-bit)",
     204    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows10"),       "Windows 10 (64-bit)",
    185205      VBOXOSTYPE_Win10_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    186206      1, 2048, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    187207      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    188208
    189     { "Windows", "Microsoft Windows", "",               "Windows2016_x64",    "Windows 2016 (64-bit)",
     209    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2016"),     "Windows 2016 (64-bit)",
    190210      VBOXOSTYPE_Win2k16_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    191211      1, 2048, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    192212      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    193213
    194     { "Windows", "Microsoft Windows", "",               "Windows2019_x64",    "Windows 2019 (64-bit)",
     214    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2019"),     "Windows 2019 (64-bit)",
    195215      VBOXOSTYPE_Win2k19_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    196216      1, 2048, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    197217      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    198218
    199     { "Windows", "Microsoft Windows", "",               "Windows11_x64",      "Windows 11 (64-bit)",
     219    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows11"),       "Windows 11 (64-bit)",
    200220      VBOXOSTYPE_Win11_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_EFI_SECUREBOOT | VBOXOSHINT_TPM2 | VBOXOSHINT_WDDM_GRAPHICS,
    201221      2, 4096, 128, 80 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    202222      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    203223
    204     { "Windows", "Microsoft Windows", "",               "Windows2022_x64",    "Windows 2022 (64-bit)",
     224    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("Windows2022"),     "Windows 2022 (64-bit)",
    205225      VBOXOSTYPE_Win2k22_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_WDDM_GRAPHICS,
    206226      1, 2048, 128, 50 * _1G64, GraphicsControllerType_VBoxSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    207227      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    208228
    209     { "Windows", "Microsoft Windows", "",               "WindowsNT",          "Other Windows (32-bit)",
     229    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X86("WindowsNT"),       "Other Windows (32-bit)",
    210230      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
    211231      1,  512,  16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    212232      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    213233
    214     { "Windows", "Microsoft Windows", "",               "WindowsNT_x64",      "Other Windows (64-bit)",
     234    { "Windows", "Microsoft Windows", "",               GUEST_OS_ID_STR_X64("WindowsNT"),       "Other Windows (64-bit)",
    215235      VBOXOSTYPE_WinNT_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_X86_PAE | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET,
    216236      1,  512,  16, 20 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
     
    230250#define VBOX_LINUX_OSHINTS_D_X64  (VBOXOSHINT_RTCUTC | VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC)
    231251
    232 #define VBOX_LINUX_OSTYPE_X86(a_OStype)     VBOXOSTYPE_ ## a_OStype
    233 #define VBOX_LINUX_OSTYPE_X64(a_OStype)     VBOXOSTYPE_ ## a_OStype ## _x64
    234 #define VBOX_LINUX_OSTYPE_ARM32(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _arm32
    235 #define VBOX_LINUX_OSTYPE_ARM64(a_OStype)   VBOXOSTYPE_ ## a_OStype ## _arm64
    236 
    237 /** Base string for Linux-based OS IDs. */
    238 #define VBOX_LINUX_OSID_STR_BASE(a_OSid)    #a_OSid
    239 /* Note: Keep this naming for legacy reasons. Always meant x86 (32-bit). */
    240 #define VBOX_LINUX_OSID_STR_X86(a_OSid)     VBOX_LINUX_OSID_STR_BASE(a_OSid)
    241 #define VBOX_LINUX_OSID_STR_X64(a_OSid)     VBOX_LINUX_OSID_STR_BASE(a_OSid ## _x64)
    242 /* New since VBox 7.1. */
    243 #define VBOX_LINUX_OSID_STR_ARM32(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _arm32)
    244 /* New since VBox 7.1. */
    245 #define VBOX_LINUX_OSID_STR_ARM64(a_OSid)   VBOX_LINUX_OSID_STR_BASE(a_OSid ## _arm64)
    246 
    247 #define VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
     252#define VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
    248253                                        a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \
    249     { "Linux",   "Linux", #a_Variant, VBOX_LINUX_OSID_STR_X86(a_Id), a_Description, VBOX_LINUX_OSTYPE_X86(a_OStype), a_OSHint, \
     254    { "Linux",   "Linux", a_szVariant, GUEST_OS_ID_STR_X86(#a_Id), a_Description, VBOX_OSTYPE_X86(a_OStype), a_OSHint, \
    250255      1, a_Memory, a_Vram, a_Diskspace * _1G64, GraphicsControllerType_VMSVGA, a_NetworkAdapter, 0, StorageControllerType_PIIX4, StorageBus_IDE, \
    251256      a_HDStorageController, a_HDStorageBusType, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980  }
    252257
    253 #define VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
     258#define VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
    254259                                        a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \
    255     { "Linux",   "Linux", #a_Variant, VBOX_LINUX_OSID_STR_X64(a_Id), a_Description, VBOX_LINUX_OSTYPE_X64(a_OStype), a_OSHint, \
     260    { "Linux",   "Linux", a_szVariant, GUEST_OS_ID_STR_X64(#a_Id), a_Description, VBOX_OSTYPE_X64(a_OStype), a_OSHint, \
    256261      1, a_Memory, a_Vram, a_Diskspace * _1G64, GraphicsControllerType_VMSVGA, a_NetworkAdapter, 0, StorageControllerType_PIIX4, StorageBus_IDE, \
    257262      a_HDStorageController, a_HDStorageBusType, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980  }
    258263
    259 #define VBOX_LINUX_SUBTYPE_TEMPLATE_ARM64(a_Variant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
    260                                            a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \
    261     { "Linux",   "Linux", #a_Variant, VBOX_LINUX_OSID_STR_ARM64(a_Id), a_Description, VBOX_LINUX_OSTYPE_ARM64(a_OStype), a_OSHint, \
     264#define VBOX_LINUX_SUBTYPE_TEMPLATE_ARM64(a_szVariant, a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \
     265                                          a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \
     266    { "Linux",   "Linux", a_szVariant, GUEST_OS_ID_STR_A64(#a_Id), a_Description, VBOX_OSTYPE_ARM64(a_OStype), a_OSHint, \
    262267      1, a_Memory, a_Vram, a_Diskspace * _1G64, GraphicsControllerType_VMSVGA, a_NetworkAdapter, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, \
    263268      a_HDStorageController, a_HDStorageBusType, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_VirtioSound, AudioCodecType_Null }
    264269
    265270/* Linux x86 32-bit sub-type template defaulting to 1 CPU with USB-tablet-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    266 #define VBOX_LINUX_SUBTYPE_A_X86(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    267     VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_X86, a_Memory, a_Vram, a_Diskspace, \
     271#define VBOX_LINUX_SUBTYPE_A_X86(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     272    VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_X86, a_Memory, a_Vram, a_Diskspace, \
    268273                                     NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    269274
    270275/* Linux x86 64-bit sub-type template defaulting to 1 CPU with USB-tablet-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    271 #define VBOX_LINUX_SUBTYPE_A_X64(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    272     VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_X64, a_Memory, a_Vram, a_Diskspace, \
     276#define VBOX_LINUX_SUBTYPE_A_X64(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     277    VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_X64, a_Memory, a_Vram, a_Diskspace, \
    273278                                     NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    274279
    275 #define VBOX_LINUX_SUBTYPE_A_ARM64(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    276     VBOX_LINUX_SUBTYPE_TEMPLATE_ARM64(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_ARM64, a_Memory, a_Vram, a_Diskspace, \
     280#define VBOX_LINUX_SUBTYPE_A_A64(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     281    VBOX_LINUX_SUBTYPE_TEMPLATE_ARM64(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_ARM64, a_Memory, a_Vram, a_Diskspace, \
    277282                                      NetworkAdapterType_I82540EM, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI)
    278283
    279 #define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X86(a_Variant, a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \
    280     VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_X86, a_Memory, a_Vram, a_Diskspace, \
     284#define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X86(a_szVariant, a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \
     285    VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_X86, a_Memory, a_Vram, a_Diskspace, \
    281286                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    282287
    283 #define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X64(a_Variant, a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \
    284     VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_X64, a_Memory, a_Vram, a_Diskspace, \
     288#define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X64(a_szVariant, a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \
     289    VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_X64, a_Memory, a_Vram, a_Diskspace, \
    285290                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    286291
    287292/* Linux x86 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/PAE-NX/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    288 #define VBOX_LINUX_SUBTYPE_B_X86(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    289     VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_X86, a_Memory, a_Vram, a_Diskspace, \
     293#define VBOX_LINUX_SUBTYPE_B_X86(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     294    VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_X86, a_Memory, a_Vram, a_Diskspace, \
    290295                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    291296
    292297/* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/PAE-NX/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    293 #define VBOX_LINUX_SUBTYPE_B_X64(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    294     VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_X64, a_Memory, a_Vram, a_Diskspace, \
     298#define VBOX_LINUX_SUBTYPE_B_X64(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     299    VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_X64, a_Memory, a_Vram, a_Diskspace, \
    295300                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    296301
    297302/* Linux 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    298 #define VBOX_LINUX_SUBTYPE_C_X86(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    299     VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_X86, a_Memory, a_Vram, a_Diskspace, \
     303#define VBOX_LINUX_SUBTYPE_C_X86(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     304    VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_X86, a_Memory, a_Vram, a_Diskspace, \
    300305                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    301306
    302307/* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */
    303 #define VBOX_LINUX_SUBTYPE_C_X64(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    304     VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_X64, a_Memory, a_Vram, a_Diskspace, \
     308#define VBOX_LINUX_SUBTYPE_C_X64(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     309    VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_X64, a_Memory, a_Vram, a_Diskspace, \
    305310                                    NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA)
    306311
    307312/* Linux 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */
    308 #define VBOX_LINUX_SUBTYPE_D_X86(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    309     VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_X86, a_Memory, a_Vram, a_Diskspace, \
     313#define VBOX_LINUX_SUBTYPE_D_X86(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     314    VBOX_LINUX_SUBTYPE_TEMPLATE_X86(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_X86, a_Memory, a_Vram, a_Diskspace, \
    310315                                    NetworkAdapterType_Am79C973, StorageControllerType_PIIX4, StorageBus_IDE)
    311316
    312317/* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */
    313 #define VBOX_LINUX_SUBTYPE_D_X64(a_Variant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
    314     VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_Variant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_X64, a_Memory, a_Vram, a_Diskspace, \
     318#define VBOX_LINUX_SUBTYPE_D_X64(a_szVariant, a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \
     319    VBOX_LINUX_SUBTYPE_TEMPLATE_X64(a_szVariant, a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_D_X64, a_Memory, a_Vram, a_Diskspace, \
    315320                                    NetworkAdapterType_I82540EM, StorageControllerType_PIIX4, StorageBus_IDE)
    316321
    317     VBOX_LINUX_SUBTYPE_D_X86(Linux 2.2,   Linux22, "Linux 2.2 (32-bit)",                      64,  4, 2),
    318     VBOX_LINUX_SUBTYPE_D_X86(Linux 2.4,   Linux24, "Linux 2.4 (32-bit)",                     128, 16, 2),
    319     VBOX_LINUX_SUBTYPE_D_X64(Linux 2.4,   Linux24, "Linux 2.4 (64-bit)",                    1024, 16, 4),
    320     VBOX_LINUX_SUBTYPE_A_X86(Linux 2.6,   Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (32-bit)",  1024, 16, 8),
    321     VBOX_LINUX_SUBTYPE_A_X64(Linux 2.6,   Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (64-bit)",  1024, 16, 8),
    322 
    323     VBOX_LINUX_SUBTYPE_A_X86(ArchLinux, ArchLinux, "Arch Linux (32-bit)", 1024, 16, 8),
    324     VBOX_LINUX_SUBTYPE_A_X64(ArchLinux, ArchLinux, "Arch Linux (64-bit)", 1024, 16, 8),
    325     VBOX_LINUX_SUBTYPE_A_ARM64(ArchLinux, ArchLinux, "Arch Linux (64-bit)", 1024, 128, 8),
    326 
    327     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian,   "Debian (32-bit)",             2048, 16, 20),
    328     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian,   "Debian (64-bit)",             2048, 16, 20),
    329     VBOX_LINUX_SUBTYPE_A_ARM64(Debian,  Debian, "Debian (64-bit)",             2048, 128, 20),
    330     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian31, "Debian 3.1 Sarge (32-bit)",   1024, 16, 8),  // 32-bit only
    331     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian4,  "Debian 4.0 Etch (32-bit)",    1024, 16, 8),
    332     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian4,  "Debian 4.0 Etch (64-bit)",    1024, 16, 8),
    333     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian5,  "Debian 5.0 Lenny (32-bit)",   1024, 16, 8),
    334     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian5,  "Debian 5.0 Lenny (64-bit)",   1024, 16, 8),
    335     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian6,  "Debian 6.0 Squeeze (32-bit)", 1024, 16, 8),
    336     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian6,  "Debian 6.0 Squeeze (64-bit)", 1024, 16, 8),
    337     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian7,  "Debian 7 Wheezy (32-bit)",    2048, 16, 20),
    338     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian7,  "Debian 7 Wheezy (64-bit)",    2048, 16, 20),
    339     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian8,  "Debian 8 Jessie (32-bit)",    2048, 16, 20),
    340     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian8,  "Debian 8 Jessie (64-bit)",    2048, 16, 20),
    341     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian9,  "Debian 9 Stretch (32-bit)",   2048, 16, 20),
    342     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian9,  "Debian 9 Stretch (64-bit)",   2048, 16, 20),
    343     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian10, "Debian 10 Buster (32-bit)",   2048, 16, 20),
    344     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian10, "Debian 10 Buster (64-bit)",   2048, 16, 20),
    345     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian11, "Debian 11 Bullseye (32-bit)", 2048, 16, 20),
    346     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian11, "Debian 11 Bullseye (64-bit)", 2048, 16, 20),
    347     VBOX_LINUX_SUBTYPE_A_X86(Debian,  Debian12, "Debian 12 Bookworm (32-bit)", 2048, 16, 20),
    348     VBOX_LINUX_SUBTYPE_A_X64(Debian,  Debian12, "Debian 12 Bookworm (64-bit)", 2048, 16, 20),
    349 
    350     VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X86(Fedora, Fedora, "Fedora (32-bit)", FedoraCore, 2048, 16, 15),
    351     VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X64(Fedora, Fedora, "Fedora (64-bit)", FedoraCore, 2048, 16, 15),
    352 
    353     VBOX_LINUX_SUBTYPE_A_X86(Gentoo, Gentoo, "Gentoo (32-bit)", 1024, 16, 8),
    354     VBOX_LINUX_SUBTYPE_A_X64(Gentoo, Gentoo, "Gentoo (64-bit)", 1024, 16, 8),
    355 
    356     VBOX_LINUX_SUBTYPE_A_X86(Mandriva, Mandriva,  "Mandriva (32-bit)",        1024, 16, 8),
    357     VBOX_LINUX_SUBTYPE_A_X64(Mandriva, Mandriva,  "Mandriva (64-bit)",        1024, 16, 8),
    358     VBOX_LINUX_SUBTYPE_A_X86(Mandriva, OpenMandriva_Lx, "OpenMandriva Lx (32-bit)", 2048, 16, 10),
    359     VBOX_LINUX_SUBTYPE_A_X64(Mandriva, OpenMandriva_Lx, "OpenMandriva Lx (64-bit)", 2048, 16, 10),
    360     VBOX_LINUX_SUBTYPE_A_X86(PCLinuxOS, PCLinuxOS, "PCLinuxOS / PCLOS (32-bit)",     2048, 16, 10),
    361     VBOX_LINUX_SUBTYPE_A_X64(PCLinuxOS, PCLinuxOS, "PCLinuxOS / PCLOS (64-bit)",     2048, 16, 10),
    362     VBOX_LINUX_SUBTYPE_A_X86(Mageia, Mageia,    "Mageia (32-bit)",                2048, 16, 10),
    363     VBOX_LINUX_SUBTYPE_A_X64(Mageia, Mageia,    "Mageia (64-bit)",                2048, 16, 10),
    364 
    365     VBOX_LINUX_SUBTYPE_B_X86(Oracle Linux, Oracle,   "Oracle Linux (32-bit)",      2048, 16, 20),
    366     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle,   "Oracle Linux (64-bit)",      2048, 16, 20),
    367     VBOX_LINUX_SUBTYPE_B_X86(Oracle Linux, Oracle4,  "Oracle Linux 4.x (32-bit)",  1024, 16, 8),
    368     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle4,  "Oracle Linux 4.x (64-bit)",  1024, 16, 8),
    369     VBOX_LINUX_SUBTYPE_B_X86(Oracle Linux, Oracle5,  "Oracle Linux 5.x (32-bit)",  1024, 16, 8),
    370     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle5,  "Oracle Linux 5.x (64-bit)",  1024, 16, 8),
    371     VBOX_LINUX_SUBTYPE_B_X86(Oracle Linux, Oracle6,  "Oracle Linux 6.x (32-bit)",  2048, 16, 10),
    372     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle6,  "Oracle Linux 6.x (64-bit)",  2048, 16, 10),
    373     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle7,  "Oracle Linux 7.x (64-bit)",  2048, 16, 20),  // 64-bit only
    374     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle8,  "Oracle Linux 8.x (64-bit)",  2048, 16, 20),  // 64-bit only
    375     VBOX_LINUX_SUBTYPE_B_X64(Oracle Linux, Oracle9,  "Oracle Linux 9.x (64-bit)",  2048, 16, 20),  // 64-bit only
    376 
    377     VBOX_LINUX_SUBTYPE_B_X86(Red Hat, RedHat,   "Red Hat (32-bit)",      2048, 16, 20),
    378     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat,   "Red Hat (64-bit)",      2048, 16, 20),
    379     VBOX_LINUX_SUBTYPE_B_X86(Red Hat, RedHat3,  "Red Hat 3.x (32-bit)",  1024, 16, 8),
    380     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat3,  "Red Hat 3.x (64-bit)",  1024, 16, 8),
    381     VBOX_LINUX_SUBTYPE_B_X86(Red Hat, RedHat4,  "Red Hat 4.x (32-bit)",  1024, 16, 8),
    382     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat4,  "Red Hat 4.x (64-bit)",  1024, 16, 8),
    383     VBOX_LINUX_SUBTYPE_B_X86(Red Hat, RedHat5,  "Red Hat 5.x (32-bit)",  1024, 16, 8),
    384     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat5,  "Red Hat 5.x (64-bit)",  1024, 16, 8),
    385     VBOX_LINUX_SUBTYPE_B_X86(Red Hat, RedHat6,  "Red Hat 6.x (32-bit)",  1024, 16, 10),
    386     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat6,  "Red Hat 6.x (64-bit)",  1024, 16, 10),
    387     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat7,  "Red Hat 7.x (64-bit)",  2048, 16, 20),  // 64-bit only
    388     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat8,  "Red Hat 8.x (64-bit)",  2048, 16, 20),  // 64-bit only
    389     VBOX_LINUX_SUBTYPE_B_X64(Red Hat, RedHat9,  "Red Hat 9.x (64-bit)",  2048, 16, 20),  // 64-bit only
    390 
    391     VBOX_LINUX_SUBTYPE_A_X86(openSUSE, OpenSUSE,            "openSUSE (32-bit)",               1024, 16, 8),
    392     VBOX_LINUX_SUBTYPE_A_X64(openSUSE, OpenSUSE,            "openSUSE (64-bit)",               1024, 16, 8),
    393     VBOX_LINUX_SUBTYPE_A_X64(openSUSE, OpenSUSE_Leap,       "openSUSE Leap (64-bit)",          2048, 16, 8),  // 64-bit only
    394     VBOX_LINUX_SUBTYPE_A_X86(openSUSE, OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (32-bit)",    2048, 16, 8),
    395     VBOX_LINUX_SUBTYPE_A_X64(openSUSE, OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (64-bit)",    2048, 16, 8),
    396     VBOX_LINUX_SUBTYPE_A_X86(SUSE, SUSE_LE,             "SUSE Linux Enterprise (32-bit)",  2048, 16, 8),
    397     VBOX_LINUX_SUBTYPE_A_X64(SUSE, SUSE_LE,             "SUSE Linux Enterprise (64-bit)",  2048, 16, 8),
    398 
    399     VBOX_LINUX_SUBTYPE_A_X86(TurboLinux, Turbolinux, "Turbolinux (32-bit)", 384, 16, 8),
    400     VBOX_LINUX_SUBTYPE_A_X64(TurboLinux, Turbolinux, "Turbolinux (64-bit)", 384, 16, 8),
    401 
    402     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu,       "Ubuntu (32-bit)",                             2048, 16, 25),
    403     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu,       "Ubuntu (64-bit)",                             2048, 16, 25),
    404     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (32-bit)",       256, 16, 3),
    405     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (64-bit)",       256, 16, 3),
    406     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu10,     "Ubuntu 10.10 (Maverick Meerkat) (32-bit)",     256, 16, 3),
    407     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu10,     "Ubuntu 10.10 (Maverick Meerkat) (64-bit)",     256, 16, 3),
    408     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu11,     "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (32-bit)",  384, 16, 5),
    409     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu11,     "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (64-bit)",  384, 16, 5),
    410     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (32-bit)", 768, 16, 5),
    411     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (64-bit)", 768, 16, 5),
    412     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu12,     "Ubuntu 12.10 (Quantal Quetzal) (32-bit)",      768, 16, 5),
    413     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu12,     "Ubuntu 12.10 (Quantal Quetzal) (64-bit)",      768, 16, 5),
    414     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu13,     "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (32-bit)",  768, 16, 5),
    415     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu13,     "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (64-bit)",  768, 16, 5),
    416     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (32-bit)",     1536, 16, 7),
    417     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (64-bit)",     1536, 16, 7),
    418     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu14,     "Ubuntu 14.10 (Utopic Unicorn) (32-bit)",      1536, 16, 7),
    419     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu14,     "Ubuntu 14.10 (Utopic Unicorn) (64-bit)",      1536, 16, 7),
    420     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu15,     "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (32-bit)",  1536, 16, 7),
    421     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu15,     "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (64-bit)",  1536, 16, 7),
    422     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (32-bit)",    1536, 16, 10),
    423     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (64-bit)",    1536, 16, 10),
    424     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu16,     "Ubuntu 16.10 (Yakkety Yak) (32-bit)",         1536, 16, 10),
    425     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu16,     "Ubuntu 16.10 (Yakkety Yak) (64-bit)",         1536, 16, 10),
    426     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu17,     "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (32-bit)", 1536, 16, 10),
    427     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu17,     "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (64-bit)", 1536, 16, 10),
    428     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (32-bit)",   2048, 16, 25),
    429     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (64-bit)",   2048, 16, 25),
    430     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu18,     "Ubuntu 18.10 (Cosmic Cuttlefish) (32-bit)",   2048, 16, 25),
    431     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu18,     "Ubuntu 18.10 (Cosmic Cuttlefish) (64-bit)",   2048, 16, 25),
    432     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Ubuntu19,     "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (32-bit)",     2048, 16, 25),
    433     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu19,     "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (64-bit)",     2048, 16, 25),
    434     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu20_LTS, "Ubuntu 20.04 LTS (Focal Fossa) (64-bit)",     2048, 16, 25),  // 64-bit only
    435     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu20,     "Ubuntu 20.10 (Groovy Gorilla) (64-bit)",      2048, 16, 25),  // 64-bit only
    436     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu21,     "Ubuntu 21.04 (Hirsute Hippo) / 21.10 (Impish Indri) (64-bit)",  2048, 16, 25), // 64-bit only
    437     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu22_LTS, "Ubuntu 22.04 LTS (Jammy Jellyfish) (64-bit)", 2048, 16, 25), // 64-bit only
    438     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu22,     "Ubuntu 22.10 (Kinetic Kudu) (64-bit)", 2048, 16, 25), // 64-bit only
    439     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Ubuntu23,     "Ubuntu 23.04 (Lunar Lobster) (64-bit)", 2048, 16, 25), // 64-bit only
    440     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Lubuntu,      "Lubuntu (32-bit)",  1024, 16, 10),
    441     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Lubuntu,      "Lubuntu (64-bit)",  1024, 16, 10),
    442     VBOX_LINUX_SUBTYPE_A_X86(Ubuntu, Xubuntu,      "Xubuntu (32-bit)",  1024, 16, 10),
    443     VBOX_LINUX_SUBTYPE_A_X64(Ubuntu, Xubuntu,      "Xubuntu (64-bit)",  1024, 16, 10),
    444 
    445     VBOX_LINUX_SUBTYPE_C_X86(Xandros, Xandros, "Xandros (32-bit)", 1024, 16, 8),
    446     VBOX_LINUX_SUBTYPE_C_X64(Xandros, Xandros, "Xandros (64-bit)", 1024, 16, 8),
    447 
    448     VBOX_LINUX_SUBTYPE_A_X86(Other Linux, Linux, "Other Linux (32-bit)", 256, 16, 8),
    449     VBOX_LINUX_SUBTYPE_B_X64(Other Linux, Linux, "Other Linux (64-bit)", 512, 16, 8),
    450 
    451     { "Solaris", "Solaris",           "",        "Solaris",                     "Oracle Solaris 10 5/09 and earlier (32-bit)",
     322    VBOX_LINUX_SUBTYPE_D_X86("Linux 2.2",    Linux22,            "Linux 2.2 (32-bit)",                      64,  4, 2),
     323    VBOX_LINUX_SUBTYPE_D_X86("Linux 2.4",    Linux24,            "Linux 2.4 (32-bit)",                     128, 16, 2),
     324    VBOX_LINUX_SUBTYPE_D_X64("Linux 2.4",    Linux24,            "Linux 2.4 (64-bit)",                    1024, 16, 4),
     325    VBOX_LINUX_SUBTYPE_A_X86("Linux 2.6",    Linux26,            "Linux 2.6 / 3.x / 4.x / 5.x (32-bit)",  1024, 16, 8),
     326    VBOX_LINUX_SUBTYPE_A_X64("Linux 2.6",    Linux26,            "Linux 2.6 / 3.x / 4.x / 5.x (64-bit)",  1024, 16, 8),
     327
     328    VBOX_LINUX_SUBTYPE_A_X86("ArchLinux",    ArchLinux,          "Arch Linux (32-bit)",             1024, 16, 8),
     329    VBOX_LINUX_SUBTYPE_A_X64("ArchLinux",    ArchLinux,          "Arch Linux (64-bit)",             1024, 16, 8),
     330    VBOX_LINUX_SUBTYPE_A_A64("ArchLinux",    ArchLinux,          "Arch Linux (64-bit)",             1024, 128, 8),
     331
     332    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian,             "Debian (32-bit)",                 2048, 16, 20),
     333    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian,             "Debian (64-bit)",                 2048, 16, 20),
     334    VBOX_LINUX_SUBTYPE_A_A64("Debian",       Debian,             "Debian (64-bit)",                 2048, 128, 20), /** @todo r=bird: "Debian (ARM 64-bit)"? */
     335    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian31,           "Debian 3.1 Sarge (32-bit)",       1024, 16, 8),  // 32-bit only
     336    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian4,            "Debian 4.0 Etch (32-bit)",        1024, 16, 8),
     337    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian4,            "Debian 4.0 Etch (64-bit)",        1024, 16, 8),
     338    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian5,            "Debian 5.0 Lenny (32-bit)",       1024, 16, 8),
     339    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian5,            "Debian 5.0 Lenny (64-bit)",       1024, 16, 8),
     340    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian6,            "Debian 6.0 Squeeze (32-bit)",     1024, 16, 8),
     341    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian6,            "Debian 6.0 Squeeze (64-bit)",     1024, 16, 8),
     342    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian7,            "Debian 7 Wheezy (32-bit)",        2048, 16, 20),
     343    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian7,            "Debian 7 Wheezy (64-bit)",        2048, 16, 20),
     344    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian8,            "Debian 8 Jessie (32-bit)",        2048, 16, 20),
     345    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian8,            "Debian 8 Jessie (64-bit)",        2048, 16, 20),
     346    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian9,            "Debian 9 Stretch (32-bit)",       2048, 16, 20),
     347    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian9,            "Debian 9 Stretch (64-bit)",       2048, 16, 20),
     348    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian10,           "Debian 10 Buster (32-bit)",       2048, 16, 20),
     349    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian10,           "Debian 10 Buster (64-bit)",       2048, 16, 20),
     350    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian11,           "Debian 11 Bullseye (32-bit)",     2048, 16, 20),
     351    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian11,           "Debian 11 Bullseye (64-bit)",     2048, 16, 20),
     352    VBOX_LINUX_SUBTYPE_A_X86("Debian",       Debian12,           "Debian 12 Bookworm (32-bit)",     2048, 16, 20),
     353    VBOX_LINUX_SUBTYPE_A_X64("Debian",       Debian12,           "Debian 12 Bookworm (64-bit)",     2048, 16, 20),
     354
     355    /** @todo rename VBOXOSTYPE entries to Fedora to avoid this? */
     356    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X86("Fedora", Fedora,       "Fedora (32-bit)", FedoraCore,     2048, 16, 15),
     357    VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_X64("Fedora", Fedora,       "Fedora (64-bit)", FedoraCore,     2048, 16, 15),
     358
     359    VBOX_LINUX_SUBTYPE_A_X86("Gentoo",       Gentoo,             "Gentoo (32-bit)",                 1024, 16, 8),
     360    VBOX_LINUX_SUBTYPE_A_X64("Gentoo",       Gentoo,             "Gentoo (64-bit)",                 1024, 16, 8),
     361
     362    VBOX_LINUX_SUBTYPE_A_X86("Mandriva",     Mandriva,           "Mandriva (32-bit)",               1024, 16, 8),
     363    VBOX_LINUX_SUBTYPE_A_X64("Mandriva",     Mandriva,           "Mandriva (64-bit)",               1024, 16, 8),
     364    VBOX_LINUX_SUBTYPE_A_X86("Mandriva",     OpenMandriva_Lx,    "OpenMandriva Lx (32-bit)",        2048, 16, 10),
     365    VBOX_LINUX_SUBTYPE_A_X64("Mandriva",     OpenMandriva_Lx,    "OpenMandriva Lx (64-bit)",        2048, 16, 10),
     366    VBOX_LINUX_SUBTYPE_A_X86("PCLinuxOS",    PCLinuxOS,          "PCLinuxOS / PCLOS (32-bit)",      2048, 16, 10),
     367    VBOX_LINUX_SUBTYPE_A_X64("PCLinuxOS",    PCLinuxOS,          "PCLinuxOS / PCLOS (64-bit)",      2048, 16, 10),
     368    VBOX_LINUX_SUBTYPE_A_X86("Mageia",       Mageia,             "Mageia (32-bit)",                 2048, 16, 10),
     369    VBOX_LINUX_SUBTYPE_A_X64("Mageia",       Mageia,             "Mageia (64-bit)",                 2048, 16, 10),
     370
     371    VBOX_LINUX_SUBTYPE_B_X86("Oracle Linux", Oracle,             "Oracle Linux (32-bit)",           2048, 16, 20),
     372    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle,             "Oracle Linux (64-bit)",           2048, 16, 20),
     373    VBOX_LINUX_SUBTYPE_B_X86("Oracle Linux", Oracle4,            "Oracle Linux 4.x (32-bit)",       1024, 16, 8),
     374    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle4,            "Oracle Linux 4.x (64-bit)",       1024, 16, 8),
     375    VBOX_LINUX_SUBTYPE_B_X86("Oracle Linux", Oracle5,            "Oracle Linux 5.x (32-bit)",       1024, 16, 8),
     376    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle5,            "Oracle Linux 5.x (64-bit)",       1024, 16, 8),
     377    VBOX_LINUX_SUBTYPE_B_X86("Oracle Linux", Oracle6,            "Oracle Linux 6.x (32-bit)",       2048, 16, 10),
     378    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle6,            "Oracle Linux 6.x (64-bit)",       2048, 16, 10),
     379    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle7,            "Oracle Linux 7.x (64-bit)",       2048, 16, 20),  // 64-bit only
     380    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle8,            "Oracle Linux 8.x (64-bit)",       2048, 16, 20),  // 64-bit only
     381    VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle9,            "Oracle Linux 9.x (64-bit)",       2048, 16, 20),  // 64-bit only
     382
     383    VBOX_LINUX_SUBTYPE_B_X86("Red Hat",     RedHat,              "Red Hat (32-bit)",                2048, 16, 20),
     384    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat,              "Red Hat (64-bit)",                2048, 16, 20),
     385    VBOX_LINUX_SUBTYPE_B_X86("Red Hat",     RedHat3,             "Red Hat 3.x (32-bit)",            1024, 16, 8),
     386    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat3,             "Red Hat 3.x (64-bit)",            1024, 16, 8),
     387    VBOX_LINUX_SUBTYPE_B_X86("Red Hat",     RedHat4,             "Red Hat 4.x (32-bit)",            1024, 16, 8),
     388    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat4,             "Red Hat 4.x (64-bit)",            1024, 16, 8),
     389    VBOX_LINUX_SUBTYPE_B_X86("Red Hat",     RedHat5,             "Red Hat 5.x (32-bit)",            1024, 16, 8),
     390    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat5,             "Red Hat 5.x (64-bit)",            1024, 16, 8),
     391    VBOX_LINUX_SUBTYPE_B_X86("Red Hat",     RedHat6,             "Red Hat 6.x (32-bit)",            1024, 16, 10),
     392    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat6,             "Red Hat 6.x (64-bit)",            1024, 16, 10),
     393    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat7,             "Red Hat 7.x (64-bit)",            2048, 16, 20),  // 64-bit only
     394    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat8,             "Red Hat 8.x (64-bit)",            2048, 16, 20),  // 64-bit only
     395    VBOX_LINUX_SUBTYPE_B_X64("Red Hat",     RedHat9,             "Red Hat 9.x (64-bit)",            2048, 16, 20),  // 64-bit only
     396
     397    VBOX_LINUX_SUBTYPE_A_X86("openSUSE",    OpenSUSE,            "openSUSE (32-bit)",               1024, 16, 8),
     398    VBOX_LINUX_SUBTYPE_A_X64("openSUSE",    OpenSUSE,            "openSUSE (64-bit)",               1024, 16, 8),
     399    VBOX_LINUX_SUBTYPE_A_X64("openSUSE",    OpenSUSE_Leap,       "openSUSE Leap (64-bit)",          2048, 16, 8),  // 64-bit only
     400    VBOX_LINUX_SUBTYPE_A_X86("openSUSE",    OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (32-bit)",    2048, 16, 8),
     401    VBOX_LINUX_SUBTYPE_A_X64("openSUSE",    OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (64-bit)",    2048, 16, 8),
     402    VBOX_LINUX_SUBTYPE_A_X86("SUSE",        SUSE_LE,             "SUSE Linux Enterprise (32-bit)",  2048, 16, 8),
     403    VBOX_LINUX_SUBTYPE_A_X64("SUSE",        SUSE_LE,             "SUSE Linux Enterprise (64-bit)",  2048, 16, 8),
     404
     405    VBOX_LINUX_SUBTYPE_A_X86("TurboLinux",  Turbolinux,          "Turbolinux (32-bit)",              384, 16, 8),
     406    VBOX_LINUX_SUBTYPE_A_X64("TurboLinux",  Turbolinux,          "Turbolinux (64-bit)",              384, 16, 8),
     407
     408    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu,       "Ubuntu (32-bit)",                             2048, 16, 25),
     409    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu,       "Ubuntu (64-bit)",                             2048, 16, 25),
     410    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (32-bit)",       256, 16, 3),
     411    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (64-bit)",       256, 16, 3),
     412    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu10,     "Ubuntu 10.10 (Maverick Meerkat) (32-bit)",     256, 16, 3),
     413    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu10,     "Ubuntu 10.10 (Maverick Meerkat) (64-bit)",     256, 16, 3),
     414    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu11,     "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (32-bit)",  384, 16, 5),
     415    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu11,     "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (64-bit)",  384, 16, 5),
     416    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (32-bit)", 768, 16, 5),
     417    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (64-bit)", 768, 16, 5),
     418    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu12,     "Ubuntu 12.10 (Quantal Quetzal) (32-bit)",      768, 16, 5),
     419    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu12,     "Ubuntu 12.10 (Quantal Quetzal) (64-bit)",      768, 16, 5),
     420    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu13,     "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (32-bit)",  768, 16, 5),
     421    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu13,     "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (64-bit)",  768, 16, 5),
     422    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (32-bit)",     1536, 16, 7),
     423    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (64-bit)",     1536, 16, 7),
     424    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu14,     "Ubuntu 14.10 (Utopic Unicorn) (32-bit)",      1536, 16, 7),
     425    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu14,     "Ubuntu 14.10 (Utopic Unicorn) (64-bit)",      1536, 16, 7),
     426    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu15,     "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (32-bit)",  1536, 16, 7),
     427    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu15,     "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (64-bit)",  1536, 16, 7),
     428    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (32-bit)",    1536, 16, 10),
     429    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (64-bit)",    1536, 16, 10),
     430    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu16,     "Ubuntu 16.10 (Yakkety Yak) (32-bit)",         1536, 16, 10),
     431    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu16,     "Ubuntu 16.10 (Yakkety Yak) (64-bit)",         1536, 16, 10),
     432    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu17,     "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (32-bit)", 1536, 16, 10),
     433    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu17,     "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (64-bit)", 1536, 16, 10),
     434    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (32-bit)",   2048, 16, 25),
     435    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (64-bit)",   2048, 16, 25),
     436    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu18,     "Ubuntu 18.10 (Cosmic Cuttlefish) (32-bit)",   2048, 16, 25),
     437    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu18,     "Ubuntu 18.10 (Cosmic Cuttlefish) (64-bit)",   2048, 16, 25),
     438    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Ubuntu19,     "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (32-bit)",     2048, 16, 25),
     439    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu19,     "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (64-bit)",     2048, 16, 25),
     440    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu20_LTS, "Ubuntu 20.04 LTS (Focal Fossa) (64-bit)",     2048, 16, 25),  // 64-bit only
     441    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu20,     "Ubuntu 20.10 (Groovy Gorilla) (64-bit)",      2048, 16, 25),  // 64-bit only
     442    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu21,     "Ubuntu 21.04 (Hirsute Hippo) / 21.10 (Impish Indri) (64-bit)",  2048, 16, 25), // 64-bit only
     443    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu22_LTS, "Ubuntu 22.04 LTS (Jammy Jellyfish) (64-bit)", 2048, 16, 25), // 64-bit only
     444    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu22,     "Ubuntu 22.10 (Kinetic Kudu) (64-bit)", 2048, 16, 25), // 64-bit only
     445    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu23,     "Ubuntu 23.04 (Lunar Lobster) (64-bit)", 2048, 16, 25), // 64-bit only
     446    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Lubuntu,      "Lubuntu (32-bit)",  1024, 16, 10),
     447    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Lubuntu,      "Lubuntu (64-bit)",  1024, 16, 10),
     448    VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Xubuntu,      "Xubuntu (32-bit)",  1024, 16, 10),
     449    VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Xubuntu,      "Xubuntu (64-bit)",  1024, 16, 10),
     450
     451    VBOX_LINUX_SUBTYPE_C_X86("Xandros",     Xandros,             "Xandros (32-bit)",                1024, 16, 8),
     452    VBOX_LINUX_SUBTYPE_C_X64("Xandros",     Xandros,             "Xandros (64-bit)",                1024, 16, 8),
     453
     454    VBOX_LINUX_SUBTYPE_A_X86("Other Linux", Linux,               "Other Linux (32-bit)",             256, 16, 8),
     455    VBOX_LINUX_SUBTYPE_B_X64("Other Linux", Linux,               "Other Linux (64-bit)",             512, 16, 8),
     456
     457    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X86("Solaris"),        "Oracle Solaris 10 5/09 and earlier (32-bit)",
    452458      VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
    453459      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    454460      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    455461
    456     { "Solaris", "Solaris",           "",        "Solaris_x64",                 "Oracle Solaris 10 5/09 and earlier (64-bit)",
     462    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X64("Solaris"),        "Oracle Solaris 10 5/09 and earlier (64-bit)",
    457463      VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC,
    458464      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    459465      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    460466
    461     { "Solaris", "Solaris",           "",        "Solaris10U8_or_later",        "Oracle Solaris 10 10/09 and later (32-bit)",
     467    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X86("Solaris10U8_or_later"), "Oracle Solaris 10 10/09 and later (32-bit)",
    462468      VBOXOSTYPE_Solaris10U8_or_later,     VBOXOSHINT_USBTABLET,
    463469      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    464470      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    465471
    466     { "Solaris", "Solaris",           "",        "Solaris10U8_or_later_x64",    "Oracle Solaris 10 10/09 and later (64-bit)",
     472    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X64("Solaris10U8_or_later"), "Oracle Solaris 10 10/09 and later (64-bit)",
    467473      VBOXOSTYPE_Solaris10U8_or_later_x64, VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET,
    468474      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    469475      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    470476
    471     { "Solaris", "Solaris",           "",        "Solaris11_x64",               "Oracle Solaris 11 (64-bit)",
     477    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X64("Solaris11"),      "Oracle Solaris 11 (64-bit)",
    472478      VBOXOSTYPE_Solaris11_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_RTCUTC,
    473479      1, 4096,  16, 32 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    474480      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    475481
    476     { "Solaris", "Solaris",           "",        "OpenSolaris",                 "OpenSolaris / Illumos / OpenIndiana (32-bit)",
     482    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X86("OpenSolaris"),    "OpenSolaris / Illumos / OpenIndiana (32-bit)",
    477483      VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
    478484      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    479485      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    480486
    481     { "Solaris", "Solaris",           "",        "OpenSolaris_x64",             "OpenSolaris / Illumos / OpenIndiana (64-bit)",
     487    { "Solaris", "Solaris",           "",        GUEST_OS_ID_STR_X64("OpenSolaris"),    "OpenSolaris / Illumos / OpenIndiana (64-bit)",
    482488      VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_USBTABLET,
    483489      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    484490      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    485491
    486     { "BSD",     "BSD",       "FreeBSD",         "FreeBSD",            "FreeBSD (32-bit)",
     492    { "BSD",     "BSD",       "FreeBSD",         GUEST_OS_ID_STR_X86("FreeBSD"),        "FreeBSD (32-bit)",
    487493      VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
    488494      1, 1024,  16,  2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    489495      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    490496
    491     { "BSD",     "BSD",       "FreeBSD",         "FreeBSD_x64",        "FreeBSD (64-bit)",
     497    { "BSD",     "BSD",       "FreeBSD",         GUEST_OS_ID_STR_X64("FreeBSD"),        "FreeBSD (64-bit)",
    492498      VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC,
    493499      1, 1024,  16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    494500      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    495501
    496     { "BSD",     "BSD",        "OpenBSD",        "OpenBSD",            "OpenBSD (32-bit)",
     502    { "BSD",     "BSD",        "OpenBSD",        GUEST_OS_ID_STR_X86("OpenBSD"),        "OpenBSD (32-bit)",
    497503      VBOXOSTYPE_OpenBSD,         VBOXOSHINT_X86_HWVIRTEX,
    498504      1, 1024,  16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    499505      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    500506
    501     { "BSD",     "BSD",       "OpenBSD",         "OpenBSD_x64",        "OpenBSD (64-bit)",
     507    { "BSD",     "BSD",       "OpenBSD",         GUEST_OS_ID_STR_X64("OpenBSD"),        "OpenBSD (64-bit)",
    502508      VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC,
    503509      1, 1024,  16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    504510      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    505511
    506     { "BSD",     "BSD",       "NetBSD",          "NetBSD",             "NetBSD (32-bit)",
     512    { "BSD",     "BSD",       "NetBSD",          GUEST_OS_ID_STR_X86("NetBSD"),         "NetBSD (32-bit)",
    507513      VBOXOSTYPE_NetBSD,          VBOXOSHINT_RTCUTC,
    508514      1, 1024,  16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    509515      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    510516
    511     { "BSD",     "BSD",       "NetBSD",          "NetBSD_x64",         "NetBSD (64-bit)",
     517    { "BSD",     "BSD",       "NetBSD",          GUEST_OS_ID_STR_X64("NetBSD"),         "NetBSD (64-bit)",
    512518      VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_RTCUTC,
    513519      1, 1024,  16, 16 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    514520      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    515521
    516     { "OS2",     "IBM OS/2",          "",        "OS21x",              "OS/2 1.x",
     522    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS21x"),          "OS/2 1.x",
    517523      VBOXOSTYPE_OS21x,           VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB | VBOXOSHINT_TFRESET,
    518524      1,    8,   4, 500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    519525      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    520526
    521     { "OS2",     "IBM OS/2",          "",        "OS2Warp3",           "OS/2 Warp 3",
     527    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2Warp3"),       "OS/2 Warp 3",
    522528      VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY,
    523529      1,   48,   4,  1 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    524530      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    525531
    526     { "OS2",     "IBM OS/2",          "",        "OS2Warp4",           "OS/2 Warp 4",
     532    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2Warp4"),       "OS/2 Warp 4",
    527533      VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY,
    528534      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    529535      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    530536
    531     { "OS2",     "IBM OS/2",          "",        "OS2Warp45",          "OS/2 Warp 4.5",
     537    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2Warp45"),      "OS/2 Warp 4.5",
    532538      VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY,
    533539      1,  128,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    534540      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    535541
    536     { "OS2",     "IBM OS/2",          "",        "OS2eCS",             "eComStation",
     542    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2eCS"),         "eComStation",
    537543      VBOXOSTYPE_ECS,             VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY,
    538544      1,  256,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    539545      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    540546
    541     { "OS2",     "IBM OS/2",          "",        "OS2ArcaOS",          "ArcaOS",
     547    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2ArcaOS"),      "ArcaOS",
    542548      VBOXOSTYPE_ArcaOS,          VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY,
    543549      1, 1024,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    544550      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 },
    545551
    546     { "OS2",     "IBM OS/2",          "",        "OS2",                "Other OS/2",
     552    { "OS2",     "IBM OS/2",          "",        GUEST_OS_ID_STR_X86("OS2"),            "Other OS/2",
    547553      VBOXOSTYPE_OS2,             VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
    548554      1,   96,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    549555      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    550556
    551     { "MacOS",   "Mac OS X",          "",        "MacOS",              "Mac OS X (32-bit)",
     557    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X86("MacOS"),          "Mac OS X (32-bit)",
    552558      VBOXOSTYPE_MacOS,           VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE
    553559                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    555561      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    556562
    557     { "MacOS",   "Mac OS X",          "",        "MacOS_x64",          "Mac OS X (64-bit)",
     563    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X64("MacOS"),          "Mac OS X (64-bit)",
    558564      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    559565                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    561567      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    562568
    563     { "MacOS",   "Mac OS X",          "",        "MacOS106",           "Mac OS X 10.6 Snow Leopard (32-bit)",
     569    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X86("MacOS106"),       "Mac OS X 10.6 Snow Leopard (32-bit)",
    564570      VBOXOSTYPE_MacOS106,        VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE
    565571                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    567573      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    568574
    569     { "MacOS",   "Mac OS X",          "",        "MacOS106_x64",       "Mac OS X 10.6 Snow Leopard (64-bit)",
     575    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X64("MacOS106"),       "Mac OS X 10.6 Snow Leopard (64-bit)",
    570576      VBOXOSTYPE_MacOS106_x64,    VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    571577                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    573579      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    574580
    575     { "MacOS",   "Mac OS X",          "",        "MacOS107_x64",       "Mac OS X 10.7 Lion (64-bit)",
     581    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X64("MacOS107"),       "Mac OS X 10.7 Lion (64-bit)",
    576582      VBOXOSTYPE_MacOS107_x64,    VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    577583                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    579585      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    580586
    581     { "MacOS",   "Mac OS X",          "",        "MacOS108_x64",       "Mac OS X 10.8 Mountain Lion (64-bit)",  /* Aka "Mountain Kitten". */
     587    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X64("MacOS108"),       "Mac OS X 10.8 Mountain Lion (64-bit)",  /* Aka "Mountain Kitten". */
    582588      VBOXOSTYPE_MacOS108_x64,    VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    583589                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    585591      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    586592
    587     { "MacOS",   "Mac OS X",          "",        "MacOS109_x64",       "Mac OS X 10.9 Mavericks (64-bit)", /* Not to be confused with McCain. */
     593    { "MacOS",   "Mac OS X",          "",        GUEST_OS_ID_STR_X64("MacOS109"),       "Mac OS X 10.9 Mavericks (64-bit)", /* Not to be confused with McCain. */
    588594      VBOXOSTYPE_MacOS109_x64,    VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    589595                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    591597      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    592598
    593     { "MacOS",   "Mac OS X",         "",         "MacOS1010_x64",      "Mac OS X 10.10 Yosemite (64-bit)",
     599    { "MacOS",   "Mac OS X",         "",         GUEST_OS_ID_STR_X64("MacOS1010"),      "Mac OS X 10.10 Yosemite (64-bit)",
    594600      VBOXOSTYPE_MacOS1010_x64,   VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    595601                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    597603      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    598604
    599     { "MacOS",   "Mac OS X",         "",         "MacOS1011_x64",      "Mac OS X 10.11 El Capitan (64-bit)",
     605    { "MacOS",   "Mac OS X",         "",         GUEST_OS_ID_STR_X64("MacOS1011"),      "Mac OS X 10.11 El Capitan (64-bit)",
    600606      VBOXOSTYPE_MacOS1011_x64,   VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    601607                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    603609      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    604610
    605     { "MacOS",   "Mac OS X",         "",         "MacOS1012_x64",      "macOS 10.12 Sierra (64-bit)",
     611    { "MacOS",   "Mac OS X",         "",         GUEST_OS_ID_STR_X64("MacOS1012"),      "macOS 10.12 Sierra (64-bit)",
    606612      VBOXOSTYPE_MacOS1012_x64,   VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    607613                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    609615      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    610616
    611     { "MacOS",   "Mac OS X",         "",         "MacOS1013_x64",      "macOS 10.13 High Sierra (64-bit)",
     617    { "MacOS",   "Mac OS X",         "",         GUEST_OS_ID_STR_X64("MacOS1013"),      "macOS 10.13 High Sierra (64-bit)",
    612618      VBOXOSTYPE_MacOS1013_x64,   VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_X86_PAE |  VBOXOSHINT_64BIT
    613619                                | VBOXOSHINT_USBHID | VBOXOSHINT_X86_HPET | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
     
    615621      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ICH9, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221  },
    616622
    617     { "Other",   "Other",             "",        "DOS",                "DOS",
     623    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X86("DOS"),            "DOS",
    618624      VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
    619625      1,   32,   4,  500 * _1M, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
    620626      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_SB16, AudioCodecType_SB16  },
    621627
    622     { "Other",   "Other",             "",        "Netware",            "Netware",
     628    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X86("Netware"),        "Netware",
    623629      VBOXOSTYPE_Netware,         VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
    624630      1,  512,   4,  4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    625631      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    626632
    627     { "Other",   "Other",             "",        "L4",                 "L4",
     633    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X86("L4"),             "L4",
    628634      VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
    629635      1,   64,   4,  2 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    630636      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    631637
    632     { "Other",   "Other",             "",        "QNX",                "QNX",
     638    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X86("QNX"),            "QNX",
    633639      VBOXOSTYPE_QNX,             VBOXOSHINT_X86_HWVIRTEX,
    634640      1,  512,   4,  4 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    635641      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    636642
    637     { "Other",   "Other",             "",        "JRockitVE",          "JRockitVE",
     643    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X86("JRockitVE"),      "JRockitVE",
    638644      VBOXOSTYPE_JRockitVE,       VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_X86_PAE,
    639645      1, 1024,   4,  8 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
    640646      StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    641647
    642     { "Other",   "Other",             "",        "VBoxBS_x64",         "VirtualBox Bootsector Test (64-bit)",
     648    { "Other",   "Other",             "",        GUEST_OS_ID_STR_X64("VBoxBS"),         "VirtualBox Bootsector Test (64-bit)",
    643649      VBOXOSTYPE_VBoxBS_x64,      VBOXOSHINT_X86_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_X86_IOAPIC | VBOXOSHINT_X86_PAE | VBOXOSHINT_64BIT,
    644650      1,  128,   4,  0, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette