Changeset 94460 in vbox
- Timestamp:
- Apr 4, 2022 8:30:21 PM (3 years ago)
- svn:sync-xref-src-repo-rev:
- 150791
- Location:
- trunk
- Files:
-
- 8 edited
-
include/VBox/ostypes.h (modified) (2 diffs)
-
src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (1 diff)
-
src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (3 diffs)
-
src/VBox/Main/src-all/Global.cpp (modified) (1 diff)
-
src/VBox/Main/src-server/ApplianceImpl.cpp (modified) (3 diffs)
-
src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)
-
src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/ostypes.h
r93588 r94460 102 102 VBOXOSTYPE_Debian = 0x55000, 103 103 VBOXOSTYPE_Debian_x64 = 0x55100, 104 VBOXOSTYPE_Debian31 = 0x55001, // 32-bit only 105 VBOXOSTYPE_Debian4 = 0x55002, 106 VBOXOSTYPE_Debian4_x64 = 0x55102, 107 VBOXOSTYPE_Debian5 = 0x55003, 108 VBOXOSTYPE_Debian5_x64 = 0x55103, 109 VBOXOSTYPE_Debian6 = 0x55004, 110 VBOXOSTYPE_Debian6_x64 = 0x55104, 111 VBOXOSTYPE_Debian7 = 0x55005, 112 VBOXOSTYPE_Debian7_x64 = 0x55105, 113 VBOXOSTYPE_Debian8 = 0x55006, 114 VBOXOSTYPE_Debian8_x64 = 0x55106, 115 VBOXOSTYPE_Debian9 = 0x55007, 116 VBOXOSTYPE_Debian9_x64 = 0x55107, 117 VBOXOSTYPE_Debian10 = 0x55008, 118 VBOXOSTYPE_Debian10_x64 = 0x55108, 119 VBOXOSTYPE_Debian11 = 0x55009, 120 VBOXOSTYPE_Debian11_x64 = 0x55109, 121 VBOXOSTYPE_Debian_latest_x64 = VBOXOSTYPE_Debian11_x64, 104 122 VBOXOSTYPE_OpenSUSE = 0x56000, 105 123 VBOXOSTYPE_OpenSUSE_x64 = 0x56100, 124 VBOXOSTYPE_OpenSUSE_Leap_x64 = 0x56101, // 64-bit only 125 VBOXOSTYPE_OpenSUSE_Tumbleweed = 0x56002, 126 VBOXOSTYPE_OpenSUSE_Tumbleweed_x64 = 0x56102, 127 VBOXOSTYPE_SUSE_LE = 0x56003, 128 VBOXOSTYPE_SUSE_LE_x64 = 0x56103, 106 129 VBOXOSTYPE_FedoraCore = 0x57000, 107 130 VBOXOSTYPE_FedoraCore_x64 = 0x57100, … … 110 133 VBOXOSTYPE_Mandriva = 0x59000, 111 134 VBOXOSTYPE_Mandriva_x64 = 0x59100, 135 VBOXOSTYPE_OpenMandriva_Lx = 0x59001, 136 VBOXOSTYPE_OpenMandriva_Lx_x64 = 0x59101, 137 VBOXOSTYPE_PCLinuxOS = 0x59002, 138 VBOXOSTYPE_PCLinuxOS_x64 = 0x59102, 139 VBOXOSTYPE_Mageia = 0x59003, 140 VBOXOSTYPE_Mageia_x64 = 0x59103, 112 141 VBOXOSTYPE_RedHat = 0x5A000, 113 142 VBOXOSTYPE_RedHat_x64 = 0x5A100, 143 VBOXOSTYPE_RedHat3 = 0x5A001, 144 VBOXOSTYPE_RedHat3_x64 = 0x5A101, 145 VBOXOSTYPE_RedHat4 = 0x5A002, 146 VBOXOSTYPE_RedHat4_x64 = 0x5A102, 147 VBOXOSTYPE_RedHat5 = 0x5A003, 148 VBOXOSTYPE_RedHat5_x64 = 0x5A103, 149 VBOXOSTYPE_RedHat6 = 0x5A004, 150 VBOXOSTYPE_RedHat6_x64 = 0x5A104, 151 VBOXOSTYPE_RedHat7_x64 = 0x5A105, // 64-bit only 152 VBOXOSTYPE_RedHat8_x64 = 0x5A106, // 64-bit only 153 VBOXOSTYPE_RedHat_latest_x64 = VBOXOSTYPE_RedHat8_x64, 114 154 VBOXOSTYPE_Turbolinux = 0x5B000, 115 155 VBOXOSTYPE_Turbolinux_x64 = 0x5B100, 116 156 VBOXOSTYPE_Ubuntu = 0x5C000, 117 157 VBOXOSTYPE_Ubuntu_x64 = 0x5C100, 158 VBOXOSTYPE_Xubuntu = 0x5C001, 159 VBOXOSTYPE_Xubuntu_x64 = 0x5C101, 160 VBOXOSTYPE_Lubuntu = 0x5C002, 161 VBOXOSTYPE_Lubuntu_x64 = 0x5C102, 162 VBOXOSTYPE_Ubuntu10_LTS = 0x5C003, 163 VBOXOSTYPE_Ubuntu10_LTS_x64 = 0x5C103, 164 VBOXOSTYPE_Ubuntu10 = 0x5C004, 165 VBOXOSTYPE_Ubuntu10_x64 = 0x5C104, 166 VBOXOSTYPE_Ubuntu11 = 0x5C005, 167 VBOXOSTYPE_Ubuntu11_x64 = 0x5C105, 168 VBOXOSTYPE_Ubuntu12_LTS = 0x5C006, 169 VBOXOSTYPE_Ubuntu12_LTS_x64 = 0x5C106, 170 VBOXOSTYPE_Ubuntu12 = 0x5C007, 171 VBOXOSTYPE_Ubuntu12_x64 = 0x5C107, 172 VBOXOSTYPE_Ubuntu13 = 0x5C008, 173 VBOXOSTYPE_Ubuntu13_x64 = 0x5C108, 174 VBOXOSTYPE_Ubuntu14_LTS = 0x5C009, 175 VBOXOSTYPE_Ubuntu14_LTS_x64 = 0x5C109, 176 VBOXOSTYPE_Ubuntu14 = 0x5C00a, 177 VBOXOSTYPE_Ubuntu14_x64 = 0x5C10a, 178 VBOXOSTYPE_Ubuntu15 = 0x5C00b, 179 VBOXOSTYPE_Ubuntu15_x64 = 0x5C10b, 180 VBOXOSTYPE_Ubuntu16_LTS = 0x5C00c, 181 VBOXOSTYPE_Ubuntu16_LTS_x64 = 0x5C10c, 182 VBOXOSTYPE_Ubuntu16 = 0x5C00d, 183 VBOXOSTYPE_Ubuntu16_x64 = 0x5C10d, 184 VBOXOSTYPE_Ubuntu17 = 0x5C00e, 185 VBOXOSTYPE_Ubuntu17_x64 = 0x5C10e, 186 VBOXOSTYPE_Ubuntu18_LTS = 0x5C00f, 187 VBOXOSTYPE_Ubuntu18_LTS_x64 = 0x5C10f, 188 VBOXOSTYPE_Ubuntu18 = 0x5C010, 189 VBOXOSTYPE_Ubuntu18_x64 = 0x5C110, 190 VBOXOSTYPE_Ubuntu19 = 0x5C011, 191 VBOXOSTYPE_Ubuntu19_x64 = 0x5C111, 192 VBOXOSTYPE_Ubuntu20_LTS_x64 = 0x5C112, // 64-bit only 193 VBOXOSTYPE_Ubuntu20_x64 = 0x5C113, // 64-bit only 194 VBOXOSTYPE_Ubuntu21_x64 = 0x5C114, // 64-bit only 195 VBOXOSTYPE_Ubuntu22_LTS_x64 = 0x5C115, // 64-bit only 196 VBOXOSTYPE_Ubuntu22_x64 = 0x5C116, // 64-bit only 197 VBOXOSTYPE_Ubuntu_latest_x64 = VBOXOSTYPE_Ubuntu22_x64, 118 198 VBOXOSTYPE_Xandros = 0x5D000, 119 199 VBOXOSTYPE_Xandros_x64 = 0x5D100, 120 200 VBOXOSTYPE_Oracle = 0x5E000, 121 201 VBOXOSTYPE_Oracle_x64 = 0x5E100, 202 VBOXOSTYPE_Oracle4 = 0x5E001, 203 VBOXOSTYPE_Oracle4_x64 = 0x5E101, 204 VBOXOSTYPE_Oracle5 = 0x5E002, 205 VBOXOSTYPE_Oracle5_x64 = 0x5E102, 206 VBOXOSTYPE_Oracle6 = 0x5E003, 207 VBOXOSTYPE_Oracle6_x64 = 0x5E103, 208 VBOXOSTYPE_Oracle7_x64 = 0x5E104, // 64-bit only 209 VBOXOSTYPE_Oracle8_x64 = 0x5E105, // 64-bit only 210 VBOXOSTYPE_Oracle_latest_x64 = VBOXOSTYPE_Oracle8_x64, 122 211 VBOXOSTYPE_FreeBSD = 0x60000, 123 212 VBOXOSTYPE_FreeBSD_x64 = 0x60100, -
trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
r94183 r94460 213 213 case VBOXOSTYPE_ArchLinux: pszOs = "ArchLinux"; break; 214 214 case VBOXOSTYPE_Debian: pszOs = "Debian"; break; 215 case VBOXOSTYPE_Debian31: pszOs = "Debian 3.1"; break; 216 case VBOXOSTYPE_Debian4: pszOs = "Debian 4.0"; break; 217 case VBOXOSTYPE_Debian5: pszOs = "Debian 5.0"; break; 218 case VBOXOSTYPE_Debian6: pszOs = "Debian 6.0"; break; 219 case VBOXOSTYPE_Debian7: pszOs = "Debian 7"; break; 220 case VBOXOSTYPE_Debian8: pszOs = "Debian 8"; break; 221 case VBOXOSTYPE_Debian9: pszOs = "Debian 9"; break; 222 case VBOXOSTYPE_Debian10: pszOs = "Debian 10"; break; 223 case VBOXOSTYPE_Debian11: pszOs = "Debian 11"; break; 215 224 case VBOXOSTYPE_OpenSUSE: pszOs = "openSUSE"; break; 225 case VBOXOSTYPE_OpenSUSE_Leap_x64 & ~VBOXOSTYPE_x64: pszOs = "openSUSE Leap"; break; 226 case VBOXOSTYPE_OpenSUSE_Tumbleweed: pszOs = "openSUSE Tumbleweed"; break; 227 case VBOXOSTYPE_SUSE_LE: pszOs = "SUSE Linux Enterprise"; break; 216 228 case VBOXOSTYPE_FedoraCore: pszOs = "Fedora"; break; 217 229 case VBOXOSTYPE_Gentoo: pszOs = "Gentoo"; break; 218 230 case VBOXOSTYPE_Mandriva: pszOs = "Mandriva"; break; 231 case VBOXOSTYPE_OpenMandriva_Lx: pszOs = "OpenMandriva Lx"; break; 232 case VBOXOSTYPE_PCLinuxOS: pszOs = "PCLinuxOS"; break; 233 case VBOXOSTYPE_Mageia: pszOs = "Mageia"; break; 219 234 case VBOXOSTYPE_RedHat: pszOs = "RedHat"; break; 235 case VBOXOSTYPE_RedHat3: pszOs = "RedHat 3"; break; 236 case VBOXOSTYPE_RedHat4: pszOs = "RedHat 4"; break; 237 case VBOXOSTYPE_RedHat5: pszOs = "RedHat 5"; break; 238 case VBOXOSTYPE_RedHat6: pszOs = "RedHat 6"; break; 239 case VBOXOSTYPE_RedHat7_x64 & ~VBOXOSTYPE_x64: pszOs = "RedHat 7"; break; 240 case VBOXOSTYPE_RedHat8_x64 & ~VBOXOSTYPE_x64: pszOs = "RedHat 8"; break; 220 241 case VBOXOSTYPE_Turbolinux: pszOs = "TurboLinux"; break; 221 242 case VBOXOSTYPE_Ubuntu: pszOs = "Ubuntu"; break; 243 case VBOXOSTYPE_Ubuntu10_LTS: pszOs = "Ubuntu 10.04 LTS"; break; 244 case VBOXOSTYPE_Ubuntu10: pszOs = "Ubuntu 10.10"; break; 245 case VBOXOSTYPE_Ubuntu11: pszOs = "Ubuntu 11.x"; break; 246 case VBOXOSTYPE_Ubuntu12_LTS: pszOs = "Ubuntu 12.04 LTS"; break; 247 case VBOXOSTYPE_Ubuntu12: pszOs = "Ubuntu 12.10"; break; 248 case VBOXOSTYPE_Ubuntu13: pszOs = "Ubuntu 13.x"; break; 249 case VBOXOSTYPE_Ubuntu14_LTS: pszOs = "Ubuntu 14.04 LTS"; break; 250 case VBOXOSTYPE_Ubuntu14: pszOs = "Ubuntu 14.10"; break; 251 case VBOXOSTYPE_Ubuntu15: pszOs = "Ubuntu 15.x"; break; 252 case VBOXOSTYPE_Ubuntu16_LTS: pszOs = "Ubuntu 16.04 LTS"; break; 253 case VBOXOSTYPE_Ubuntu16: pszOs = "Ubuntu 16.10"; break; 254 case VBOXOSTYPE_Ubuntu17: pszOs = "Ubuntu 17.x"; break; 255 case VBOXOSTYPE_Ubuntu18_LTS: pszOs = "Ubuntu 18.04 LTS"; break; 256 case VBOXOSTYPE_Ubuntu18: pszOs = "Ubuntu 18.10"; break; 257 case VBOXOSTYPE_Ubuntu19: pszOs = "Ubuntu 19.x"; break; 258 case VBOXOSTYPE_Ubuntu20_LTS_x64 & ~VBOXOSTYPE_x64: pszOs = "Ubuntu 20.04 LTS"; break; 259 case VBOXOSTYPE_Ubuntu20_x64 & ~VBOXOSTYPE_x64: pszOs = "Ubuntu 20.10"; break; 260 case VBOXOSTYPE_Ubuntu21_x64 & ~VBOXOSTYPE_x64: pszOs = "Ubuntu 21.x"; break; 261 case VBOXOSTYPE_Ubuntu22_LTS_x64 & ~VBOXOSTYPE_x64: pszOs = "Ubuntu 22.04 LTS"; break; 262 case VBOXOSTYPE_Ubuntu22_x64 & ~VBOXOSTYPE_x64: pszOs = "Ubuntu 22.10"; break; 263 case VBOXOSTYPE_Lubuntu: pszOs = "Lubuntu"; break; 264 case VBOXOSTYPE_Xubuntu: pszOs = "Xubuntu"; break; 222 265 case VBOXOSTYPE_Xandros: pszOs = "Xandros"; break; 223 266 case VBOXOSTYPE_Oracle: pszOs = "Oracle Linux"; break; 267 case VBOXOSTYPE_Oracle4: pszOs = "Oracle Linux 4"; break; 268 case VBOXOSTYPE_Oracle5: pszOs = "Oracle Linux 5"; break; 269 case VBOXOSTYPE_Oracle6: pszOs = "Oracle Linux 6"; break; 270 case VBOXOSTYPE_Oracle7_x64 & ~VBOXOSTYPE_x64: pszOs = "Oracle Linux 7"; break; 271 case VBOXOSTYPE_Oracle8_x64 & ~VBOXOSTYPE_x64: pszOs = "Oracle Linux 8"; break; 224 272 case VBOXOSTYPE_FreeBSD: pszOs = "FreeBSD"; break; 225 273 case VBOXOSTYPE_OpenBSD: pszOs = "OpenBSD"; break; -
trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
r94004 r94460 371 371 m_guestOSTypeIconNames.insert("Debian", ":/os_debian.png"); 372 372 m_guestOSTypeIconNames.insert("Debian_64", ":/os_debian_64.png"); 373 m_guestOSTypeIconNames.insert("Debian31", ":/os_debian.png"); 374 m_guestOSTypeIconNames.insert("Debian4", ":/os_debian.png"); 375 m_guestOSTypeIconNames.insert("Debian4_64", ":/os_debian_64.png"); 376 m_guestOSTypeIconNames.insert("Debian5", ":/os_debian.png"); 377 m_guestOSTypeIconNames.insert("Debian5_64", ":/os_debian_64.png"); 378 m_guestOSTypeIconNames.insert("Debian5", ":/os_debian.png"); 379 m_guestOSTypeIconNames.insert("Debian5_64", ":/os_debian_64.png"); 380 m_guestOSTypeIconNames.insert("Debian6", ":/os_debian.png"); 381 m_guestOSTypeIconNames.insert("Debian6_64", ":/os_debian_64.png"); 382 m_guestOSTypeIconNames.insert("Debian7", ":/os_debian.png"); 383 m_guestOSTypeIconNames.insert("Debian7_64", ":/os_debian_64.png"); 384 m_guestOSTypeIconNames.insert("Debian8", ":/os_debian.png"); 385 m_guestOSTypeIconNames.insert("Debian8_64", ":/os_debian_64.png"); 386 m_guestOSTypeIconNames.insert("Debian9", ":/os_debian.png"); 387 m_guestOSTypeIconNames.insert("Debian9_64", ":/os_debian_64.png"); 388 m_guestOSTypeIconNames.insert("Debian10", ":/os_debian.png"); 389 m_guestOSTypeIconNames.insert("Debian10_64", ":/os_debian_64.png"); 390 m_guestOSTypeIconNames.insert("Debian11", ":/os_debian.png"); 391 m_guestOSTypeIconNames.insert("Debian11_64", ":/os_debian_64.png"); 373 392 m_guestOSTypeIconNames.insert("OpenSUSE", ":/os_opensuse.png"); 374 393 m_guestOSTypeIconNames.insert("OpenSUSE_64", ":/os_opensuse_64.png"); 394 m_guestOSTypeIconNames.insert("OpenSUSE_Leap_64", ":/os_opensuse_64.png"); 395 m_guestOSTypeIconNames.insert("OpenSUSE_Tumbleweed", ":/os_opensuse.png"); 396 m_guestOSTypeIconNames.insert("OpenSUSE_Tumbleweed_64", ":/os_opensuse_64.png"); 397 m_guestOSTypeIconNames.insert("SUSE_LE", ":/os_opensuse.png"); 398 m_guestOSTypeIconNames.insert("SUSE_LE_64", ":/os_opensuse_64.png"); 375 399 m_guestOSTypeIconNames.insert("Fedora", ":/os_fedora.png"); 376 400 m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png"); … … 379 403 m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png"); 380 404 m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png"); 405 m_guestOSTypeIconNames.insert("OpenMandriva_Lx", ":/os_mandriva.png"); 406 m_guestOSTypeIconNames.insert("OpenMandriva_Lx_64", ":/os_mandriva_64.png"); 407 m_guestOSTypeIconNames.insert("PCLinuxOS", ":/os_mandriva.png"); 408 m_guestOSTypeIconNames.insert("PCLinuxOS_64", ":/os_mandriva_64.png"); 409 m_guestOSTypeIconNames.insert("Mageia", ":/os_mandriva.png"); 410 m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mandriva_64.png"); 381 411 m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png"); 382 412 m_guestOSTypeIconNames.insert("RedHat_64", ":/os_redhat_64.png"); 413 m_guestOSTypeIconNames.insert("RedHat3", ":/os_redhat.png"); 414 m_guestOSTypeIconNames.insert("RedHat3_64", ":/os_redhat_64.png"); 415 m_guestOSTypeIconNames.insert("RedHat4", ":/os_redhat.png"); 416 m_guestOSTypeIconNames.insert("RedHat4_64", ":/os_redhat_64.png"); 417 m_guestOSTypeIconNames.insert("RedHat5", ":/os_redhat.png"); 418 m_guestOSTypeIconNames.insert("RedHat5_64", ":/os_redhat_64.png"); 419 m_guestOSTypeIconNames.insert("RedHat6", ":/os_redhat.png"); 420 m_guestOSTypeIconNames.insert("RedHat6_64", ":/os_redhat_64.png"); 421 m_guestOSTypeIconNames.insert("RedHat7_64", ":/os_redhat_64.png"); 422 m_guestOSTypeIconNames.insert("RedHat8_64", ":/os_redhat_64.png"); 383 423 m_guestOSTypeIconNames.insert("Turbolinux", ":/os_turbolinux.png"); 384 424 m_guestOSTypeIconNames.insert("Turbolinux_64", ":/os_turbolinux_64.png"); 385 425 m_guestOSTypeIconNames.insert("Ubuntu", ":/os_ubuntu.png"); 386 426 m_guestOSTypeIconNames.insert("Ubuntu_64", ":/os_ubuntu_64.png"); 427 m_guestOSTypeIconNames.insert("Ubuntu10_LTS", ":/os_ubuntu.png"); 428 m_guestOSTypeIconNames.insert("Ubuntu10_LTS_64", ":/os_ubuntu_64.png"); 429 m_guestOSTypeIconNames.insert("Ubuntu10", ":/os_ubuntu.png"); 430 m_guestOSTypeIconNames.insert("Ubuntu10_64", ":/os_ubuntu_64.png"); 431 m_guestOSTypeIconNames.insert("Ubuntu11", ":/os_ubuntu.png"); 432 m_guestOSTypeIconNames.insert("Ubuntu11_64", ":/os_ubuntu_64.png"); 433 m_guestOSTypeIconNames.insert("Ubuntu12_LTS", ":/os_ubuntu.png"); 434 m_guestOSTypeIconNames.insert("Ubuntu12_LTS_64", ":/os_ubuntu_64.png"); 435 m_guestOSTypeIconNames.insert("Ubuntu12", ":/os_ubuntu.png"); 436 m_guestOSTypeIconNames.insert("Ubuntu12_64", ":/os_ubuntu_64.png"); 437 m_guestOSTypeIconNames.insert("Ubuntu13", ":/os_ubuntu.png"); 438 m_guestOSTypeIconNames.insert("Ubuntu13_64", ":/os_ubuntu_64.png"); 439 m_guestOSTypeIconNames.insert("Ubuntu14_LTS", ":/os_ubuntu.png"); 440 m_guestOSTypeIconNames.insert("Ubuntu14_LTS_64", ":/os_ubuntu_64.png"); 441 m_guestOSTypeIconNames.insert("Ubuntu14", ":/os_ubuntu.png"); 442 m_guestOSTypeIconNames.insert("Ubuntu14_64", ":/os_ubuntu_64.png"); 443 m_guestOSTypeIconNames.insert("Ubuntu15", ":/os_ubuntu.png"); 444 m_guestOSTypeIconNames.insert("Ubuntu15_64", ":/os_ubuntu_64.png"); 445 m_guestOSTypeIconNames.insert("Ubuntu16_LTS", ":/os_ubuntu.png"); 446 m_guestOSTypeIconNames.insert("Ubuntu16_LTS_64", ":/os_ubuntu_64.png"); 447 m_guestOSTypeIconNames.insert("Ubuntu16", ":/os_ubuntu.png"); 448 m_guestOSTypeIconNames.insert("Ubuntu16_64", ":/os_ubuntu_64.png"); 449 m_guestOSTypeIconNames.insert("Ubuntu17", ":/os_ubuntu.png"); 450 m_guestOSTypeIconNames.insert("Ubuntu17_64", ":/os_ubuntu_64.png"); 451 m_guestOSTypeIconNames.insert("Ubuntu18_LTS", ":/os_ubuntu.png"); 452 m_guestOSTypeIconNames.insert("Ubuntu18_LTS_64", ":/os_ubuntu_64.png"); 453 m_guestOSTypeIconNames.insert("Ubuntu18", ":/os_ubuntu.png"); 454 m_guestOSTypeIconNames.insert("Ubuntu18_64", ":/os_ubuntu_64.png"); 455 m_guestOSTypeIconNames.insert("Ubuntu19", ":/os_ubuntu.png"); 456 m_guestOSTypeIconNames.insert("Ubuntu19_64", ":/os_ubuntu_64.png"); 457 m_guestOSTypeIconNames.insert("Ubuntu20_LTS_64", ":/os_ubuntu_64.png"); 458 m_guestOSTypeIconNames.insert("Ubuntu20_64", ":/os_ubuntu_64.png"); 459 m_guestOSTypeIconNames.insert("Ubuntu21_LTS_64", ":/os_ubuntu_64.png"); 460 m_guestOSTypeIconNames.insert("Ubuntu21_64", ":/os_ubuntu_64.png"); 461 m_guestOSTypeIconNames.insert("Ubuntu22_LTS_64", ":/os_ubuntu_64.png"); 462 m_guestOSTypeIconNames.insert("Ubuntu22_64", ":/os_ubuntu_64.png"); 463 m_guestOSTypeIconNames.insert("Lubuntu", ":/os_ubuntu.png"); 464 m_guestOSTypeIconNames.insert("Lubuntu_64", ":/os_ubuntu_64.png"); 465 m_guestOSTypeIconNames.insert("Xubuntu", ":/os_ubuntu.png"); 466 m_guestOSTypeIconNames.insert("Xubuntu_64", ":/os_ubuntu_64.png"); 387 467 m_guestOSTypeIconNames.insert("Xandros", ":/os_xandros.png"); 388 468 m_guestOSTypeIconNames.insert("Xandros_64", ":/os_xandros_64.png"); 469 m_guestOSTypeIconNames.insert("Oracle", ":/os_oracle.png"); 470 m_guestOSTypeIconNames.insert("Oracle_64", ":/os_oracle_64.png"); 471 m_guestOSTypeIconNames.insert("Oracle3", ":/os_oracle.png"); 472 m_guestOSTypeIconNames.insert("Oracle3_64", ":/os_oracle_64.png"); 473 m_guestOSTypeIconNames.insert("Oracle4", ":/os_oracle.png"); 474 m_guestOSTypeIconNames.insert("Oracle4_64", ":/os_oracle_64.png"); 475 m_guestOSTypeIconNames.insert("Oracle5", ":/os_oracle.png"); 476 m_guestOSTypeIconNames.insert("Oracle5_64", ":/os_oracle_64.png"); 477 m_guestOSTypeIconNames.insert("Oracle6", ":/os_oracle.png"); 478 m_guestOSTypeIconNames.insert("Oracle6_64", ":/os_oracle_64.png"); 479 m_guestOSTypeIconNames.insert("Oracle7_64", ":/os_oracle_64.png"); 480 m_guestOSTypeIconNames.insert("Oracle8_64", ":/os_oracle_64.png"); 389 481 m_guestOSTypeIconNames.insert("Oracle", ":/os_oracle.png"); 390 482 m_guestOSTypeIconNames.insert("Oracle_64", ":/os_oracle_64.png"); -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp
r94078 r94460 122 122 { QRegularExpression("((bianca)|(cassandra)|(celena)|(daryna)|(elyssa)|(felicia)|(gloria)|(helena)|(isadora)|(julia)|(katya)|(lisa)|(maya)|(nadia)|(olivia)|(petra)|(qiana)|(rebecca)|(rafaela)|(rosa)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" }, 123 123 { QRegularExpression("((bianca)|(cassandra)|(celena)|(daryna)|(elyssa)|(felicia)|(gloria)|(helena)|(isadora)|(julia)|(katya)|(lisa)|(maya)|(nadia)|(olivia)|(petra)|(qiana)|(rebecca)|(rafaela)|(rosa)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" }, 124 { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)|(saucy)|(trusty)|(utopic)|(vivid)|(wily)|(xenial)|(yakkety)|(zesty)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" }, 125 { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)|(saucy)|(trusty)|(utopic)|(vivid)|(wily)|(xenial)|(yakkety)|(zesty)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" }, 126 { QRegularExpression("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(stretch)|(buster)|(sid)).*64", QRegularExpression::CaseInsensitiveOption), "Debian_64" }, 127 { QRegularExpression("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(stretch)|(buster)|(sid)).*32", QRegularExpression::CaseInsensitiveOption), "Debian" }, 128 { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", QRegularExpression::CaseInsensitiveOption), "Fedora_64" }, 129 { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*32", QRegularExpression::CaseInsensitiveOption), "Fedora" }, 124 { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" }, 125 { QRegularExpression("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" }, 126 { QRegularExpression("((eft)|(fawn)|(gibbon)|(heron)|(ibex)|(jackalope)|(koala)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" }, 127 { QRegularExpression("((eft)|(fawn)|(gibbon)|(heron)|(ibex)|(jackalope)|(koala)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" }, 128 { QRegularExpression("((lucid)|(lynx)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu10_LTS_64" }, 129 { QRegularExpression("((lucid)|(lynx)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu10_LTS" }, 130 { QRegularExpression("((maverick)|(meerkat)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu10_64" }, 131 { QRegularExpression("((maverick)|(meerkat)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu10" }, 132 { QRegularExpression("((natty)|(narwhal)|(oneiric)|(ocelot)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu11_64" }, 133 { QRegularExpression("((natty)|(narwhal)|(oneiric)|(ocelot)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu11" }, 134 { QRegularExpression("((precise)|(pangolin)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu12_LTS_64" }, 135 { QRegularExpression("((precise)|(pangolin)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu12_LTS" }, 136 { QRegularExpression("((quantal)|(quetzal)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu12_64" }, 137 { QRegularExpression("((quantal)|(quetzal)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu12" }, 138 { QRegularExpression("((raring)|(ringtail)|(saucy)|(salamander)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu13_64" }, 139 { QRegularExpression("((raring)|(ringtail)|(saucy)|(salamander)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu13" }, 140 { QRegularExpression("((trusty)|(tahr)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu14_LTS_64" }, 141 { QRegularExpression("((trusty)|(tahr)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu14_LTS" }, 142 { QRegularExpression("((utopic)|(unicorn)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu14_64" }, 143 { QRegularExpression("((utopic)|(unicorn)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu14" }, 144 { QRegularExpression("((vivid)|(vervet)|(wily)|(werewolf)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu15_64" }, 145 { QRegularExpression("((vivid)|(vervet)|(wily)|(werewolf)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu15" }, 146 { QRegularExpression("((xenial)|(xerus)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu16_LTS_64" }, 147 { QRegularExpression("((xenial)|(xerus)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu16_LTS" }, 148 { QRegularExpression("((yakkety)|(yak)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu16_64" }, 149 { QRegularExpression("((yakkety)|(yak)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu16" }, 150 { QRegularExpression("((zesty)|(zapus)|(artful)|(aardvark)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu17_64" }, 151 { QRegularExpression("((zesty)|(zapus)|(artful)|(aardvark)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu17" }, 152 { QRegularExpression("((bionic)|(beaver)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu18_LTS_64" }, 153 { QRegularExpression("((bionic)|(beaver)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu18_LTS" }, 154 { QRegularExpression("((cosmic)|(cuttlefish)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu18_64" }, 155 { QRegularExpression("((cosmic)|(cuttlefish)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu18" }, 156 { QRegularExpression("((disco)|(dingo)|(eoan)|(ermine)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu19_64" }, 157 { QRegularExpression("((disco)|(dingo)|(eoan)|(ermine)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu19" }, 158 { QRegularExpression("((focal)|(fossa)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu20_LTS_64" }, 159 { QRegularExpression("((groovy)|(gorilla)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu20_64" }, 160 { QRegularExpression("((hirsute)|(hippo)|(impish)|(indri)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu21_64" }, 161 { QRegularExpression("((jammy)|(jellyfish)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu22_LTS_64" }, 162 { QRegularExpression("sarge.*32", QRegularExpression::CaseInsensitiveOption), "Debian31" }, 163 { QRegularExpression("^etch.*64", QRegularExpression::CaseInsensitiveOption), "Debian4_64" }, 164 { QRegularExpression("^etch.*32", QRegularExpression::CaseInsensitiveOption), "Debian4" }, 165 { QRegularExpression("lenny.*64", QRegularExpression::CaseInsensitiveOption), "Debian5_64" }, 166 { QRegularExpression("lenny.*32", QRegularExpression::CaseInsensitiveOption), "Debian5" }, 167 { QRegularExpression("squeeze.*64", QRegularExpression::CaseInsensitiveOption), "Debian6_64" }, 168 { QRegularExpression("squeeze.*32", QRegularExpression::CaseInsensitiveOption), "Debian6" }, 169 { QRegularExpression("wheezy.*64", QRegularExpression::CaseInsensitiveOption), "Debian7_64" }, 170 { QRegularExpression("wheezy.*32", QRegularExpression::CaseInsensitiveOption), "Debian7" }, 171 { QRegularExpression("jessie.*64", QRegularExpression::CaseInsensitiveOption), "Debian8_64" }, 172 { QRegularExpression("jessie.*32", QRegularExpression::CaseInsensitiveOption), "Debian8" }, 173 { QRegularExpression("stretch.*64", QRegularExpression::CaseInsensitiveOption), "Debian9_64" }, 174 { QRegularExpression("stretch.*32", QRegularExpression::CaseInsensitiveOption), "Debian9" }, 175 { QRegularExpression("buster.*64", QRegularExpression::CaseInsensitiveOption), "Debian10_64" }, 176 { QRegularExpression("buster.*32", QRegularExpression::CaseInsensitiveOption), "Debian10" }, 177 { QRegularExpression("bullseye.*64", QRegularExpression::CaseInsensitiveOption), "Debian11_64" }, 178 { QRegularExpression("bullseye.*32", QRegularExpression::CaseInsensitiveOption), "Debian11" }, 179 { QRegularExpression("((bookworm)|(trixie)|(sid)).*64", QRegularExpression::CaseInsensitiveOption), "Debian_64" }, 180 { QRegularExpression("((bookworm)|(trixie)|(sid)).*32", QRegularExpression::CaseInsensitiveOption), "Debian" }, 181 { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)|(schrodinger)|(heisenberg)).*64", QRegularExpression::CaseInsensitiveOption), "Fedora_64" }, 182 { QRegularExpression("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)|(schrodinger)|(heisenberg)).*32", QRegularExpression::CaseInsensitiveOption), "Fedora" }, 183 { QRegularExpression("((basilisk)|(emerald)|(teal)|(celadon)|(asparagus)|(mantis)|(dartmouth)|(bottle)|(harlequin)).*64", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_64" }, 184 { QRegularExpression("((basilisk)|(emerald)|(teal)|(celadon)|(asparagus)|(mantis)|(dartmouth)|(bottle)|(harlequin)).*32", QRegularExpression::CaseInsensitiveOption), "OpenSUSE" }, 130 185 131 186 /* Regular names of Linux distributions: */ … … 134 189 { QRegularExpression("Deb.*64", QRegularExpression::CaseInsensitiveOption), "Debian_64" }, 135 190 { QRegularExpression("Deb.*32", QRegularExpression::CaseInsensitiveOption), "Debian" }, 191 { QRegularExpression("SU.*Leap.*64", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Leap_64" }, 192 { QRegularExpression("SU.*Tumble.*64", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Tumbleweed_64" }, 193 { QRegularExpression("SU.*Tumble.*32", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_Tumbleweed" }, 136 194 { QRegularExpression("((SU)|(Nov)|(SLE)).*64", QRegularExpression::CaseInsensitiveOption), "OpenSUSE_64" }, 137 195 { QRegularExpression("((SU)|(Nov)|(SLE)).*32", QRegularExpression::CaseInsensitiveOption), "OpenSUSE" }, … … 140 198 { QRegularExpression("((Gen)|(Sab)).*64", QRegularExpression::CaseInsensitiveOption), "Gentoo_64" }, 141 199 { QRegularExpression("((Gen)|(Sab)).*32", QRegularExpression::CaseInsensitiveOption), "Gentoo" }, 142 { QRegularExpression("((Man)|(Mag)).*64", QRegularExpression::CaseInsensitiveOption), "Mandriva_64" }, 143 { QRegularExpression("((Man)|(Mag)).*32", QRegularExpression::CaseInsensitiveOption), "Mandriva" }, 200 { QRegularExpression("^Man.*64", QRegularExpression::CaseInsensitiveOption), "Mandriva_64" }, 201 { QRegularExpression("^Man.*32", QRegularExpression::CaseInsensitiveOption), "Mandriva" }, 202 { QRegularExpression("Op.*Man.*Lx.*64", QRegularExpression::CaseInsensitiveOption), "OpenMandriva_Lx_64" }, 203 { QRegularExpression("Op.*Man.*Lx.*32", QRegularExpression::CaseInsensitiveOption), "OpenMandriva_Lx" }, 204 { QRegularExpression("PCL.*OS.*64", QRegularExpression::CaseInsensitiveOption), "PCLinuxOS_64" }, 205 { QRegularExpression("PCL.*OS.*32", QRegularExpression::CaseInsensitiveOption), "PCLinuxOS" }, 206 { QRegularExpression("Mageia.*64", QRegularExpression::CaseInsensitiveOption), "Mageia_64" }, 207 { QRegularExpression("Mageia.*32", QRegularExpression::CaseInsensitiveOption), "Mageia" }, 144 208 { QRegularExpression("((Red)|(rhel)|(cen)).*64", QRegularExpression::CaseInsensitiveOption), "RedHat_64" }, 145 209 { QRegularExpression("((Red)|(rhel)|(cen)).*32", QRegularExpression::CaseInsensitiveOption), "RedHat" }, 146 210 { QRegularExpression("Tur.*64", QRegularExpression::CaseInsensitiveOption), "Turbolinux_64" }, 147 211 { QRegularExpression("Tur.*32", QRegularExpression::CaseInsensitiveOption), "Turbolinux" }, 212 { QRegularExpression("Lub.*64", QRegularExpression::CaseInsensitiveOption), "Lubuntu_64" }, 213 { QRegularExpression("Lub.*32", QRegularExpression::CaseInsensitiveOption), "Lubuntu" }, 214 { QRegularExpression("Xub.*64", QRegularExpression::CaseInsensitiveOption), "Xubuntu_64" }, 215 { QRegularExpression("Xub.*32", QRegularExpression::CaseInsensitiveOption), "Xubuntu" }, 148 216 { QRegularExpression("((Ub)|(Mint)).*64", QRegularExpression::CaseInsensitiveOption), "Ubuntu_64" }, 149 217 { QRegularExpression("((Ub)|(Mint)).*32", QRegularExpression::CaseInsensitiveOption), "Ubuntu" }, -
trunk/src/VBox/Main/src-all/Global.cpp
r93588 r94460 199 199 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, 200 200 201 { "Linux", "Linux", "Linux22", "Linux 2.2", 202 VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, 203 1, 64, 4, 2 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, 204 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 205 206 { "Linux", "Linux", "Linux24", "Linux 2.4 (32-bit)", 207 VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, 208 1, 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, 209 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 210 211 { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64-bit)", 212 VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 213 1, 128, 16, 4 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 214 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 215 216 { "Linux", "Linux", "Linux26", "Linux 2.6 / 3.x / 4.x / 5.x (32-bit)", 217 VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 218 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 219 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 220 221 { "Linux", "Linux", "Linux26_64", "Linux 2.6 / 3.x / 4.x / 5.x (64-bit)", 222 VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 223 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 224 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 225 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 226 227 { "Linux", "Linux", "ArchLinux", "Arch Linux (32-bit)", 228 VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 229 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 230 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 231 232 { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64-bit)", 233 VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 234 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 235 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 236 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 237 238 { "Linux", "Linux", "Debian", "Debian (32-bit)", 239 VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 240 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 241 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 242 243 { "Linux", "Linux", "Debian_64", "Debian (64-bit)", 244 VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 245 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 246 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 247 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980}, 248 249 { "Linux", "Linux", "Fedora", "Fedora (32-bit)", 250 VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 251 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 252 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 253 254 { "Linux", "Linux", "Fedora_64", "Fedora (64-bit)", 255 VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 256 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 257 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 258 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 259 260 { "Linux", "Linux", "Gentoo", "Gentoo (32-bit)", 261 VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 262 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 263 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 264 265 { "Linux", "Linux", "Gentoo_64", "Gentoo (64-bit)", 266 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 267 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 268 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 269 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 270 271 { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)", 272 VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 273 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 274 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 275 276 { "Linux", "Linux", "Mandriva_64", "Mandriva (64-bit)", 277 VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 278 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 279 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 280 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 281 282 { "Linux", "Linux", "Oracle", "Oracle (32-bit)", 283 VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC, 284 1, 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 285 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 286 287 { "Linux", "Linux", "Oracle_64", "Oracle (64-bit)", 288 VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 289 | VBOXOSHINT_X2APIC, 290 1, 1024, 16, 12 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 291 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 292 293 { "Linux", "Linux", "RedHat", "Red Hat (32-bit)", 294 VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC, 295 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 296 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 297 298 { "Linux", "Linux", "RedHat_64", "Red Hat (64-bit)", 299 VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 300 | VBOXOSHINT_X2APIC, 301 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 302 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 303 304 { "Linux", "Linux", "OpenSUSE", "openSUSE (32-bit)", 305 VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 306 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 307 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 308 309 { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64-bit)", 310 VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 311 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 312 1, 1024, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 313 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 314 315 { "Linux", "Linux", "Turbolinux", "Turbolinux (32-bit)", 316 VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 317 1, 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 318 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 319 320 { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64-bit)", 321 VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 322 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 323 1, 384, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 324 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 325 326 { "Linux", "Linux", "Ubuntu", "Ubuntu (32-bit)", 327 VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 328 1, 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 329 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 330 331 { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64-bit)", 332 VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC 333 | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 334 1, 1024, 16, 10 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 335 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 336 337 { "Linux", "Linux", "Xandros", "Xandros (32-bit)", 338 VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC, 339 1, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 340 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 341 342 { "Linux", "Linux", "Xandros_64", "Xandros (64-bit)", 343 VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC, 344 1, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 345 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 346 347 { "Linux", "Linux", "Linux", "Other Linux (32-bit)", 348 VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 349 1, 256, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, 350 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 }, 351 352 { "Linux", "Linux", "Linux_64", "Other Linux (64-bit)", 353 VBOXOSTYPE_Linux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC 354 | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC, 355 1, 512, 16, 8 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, 356 StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700 }, 201 #define VBOX_LINUX_OSHINTS_A_32 (VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC) 202 #define VBOX_LINUX_OSHINTS_A_64 (VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC) 203 204 #define VBOX_LINUX_OSHINTS_B_32 (VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC) 205 #define VBOX_LINUX_OSHINTS_B_64 (VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC) 206 207 #define VBOX_LINUX_OSHINTS_C_32 (VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC) 208 #define VBOX_LINUX_OSHINTS_C_64 (VBOXOSHINT_RTCUTC | VBOXOSHINT_X2APIC | VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC) 209 210 #define VBOX_LINUX_OSTYPE_32(a_OStype) (VBOXOSTYPE_ ## a_OStype) 211 #define VBOX_LINUX_OSTYPE_64(a_OStype) (VBOXOSTYPE_ ## a_OStype ## _x64) 212 213 #define VBOX_LINUX_OSID_STR(a_OSid) (# a_OSid) 214 #define VBOX_LINUX_OSID_STR_64(a_OSid) VBOX_LINUX_OSID_STR(a_OSid ## _64) 215 216 #define VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \ 217 a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \ 218 { "Linux", "Linux", VBOX_LINUX_OSID_STR(a_Id), a_Description, VBOX_LINUX_OSTYPE_32(a_OStype), a_OSHint, \ 219 1, a_Memory, a_Vram, a_Diskspace * _1G64, GraphicsControllerType_VMSVGA, a_NetworkAdapter, 0, StorageControllerType_PIIX4, StorageBus_IDE, \ 220 a_HDStorageController, a_HDStorageBusType, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 } 221 222 #define VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_OStype, a_OSHint, a_Memory, a_Vram, a_Diskspace, \ 223 a_NetworkAdapter, a_HDStorageController, a_HDStorageBusType) \ 224 { "Linux", "Linux", VBOX_LINUX_OSID_STR_64(a_Id), a_Description, VBOX_LINUX_OSTYPE_64(a_OStype), a_OSHint, \ 225 1, a_Memory, a_Vram, a_Diskspace * _1G64, GraphicsControllerType_VMSVGA, a_NetworkAdapter, 0, StorageControllerType_PIIX4, StorageBus_IDE, \ 226 a_HDStorageController, a_HDStorageBusType, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_AD1980 } 227 228 /* Linux 32-bit sub-type template defaulting to 1 CPU with USB-tablet-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */ 229 #define VBOX_LINUX_SUBTYPE_A_32(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 230 VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_32, a_Memory, a_Vram, a_Diskspace, \ 231 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 232 233 /* Linux 64-bit sub-type template defaulting to 1 CPU with USB-tablet-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */ 234 #define VBOX_LINUX_SUBTYPE_A_64(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 235 VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_A_64, a_Memory, a_Vram, a_Diskspace, \ 236 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 237 238 #define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_32(a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \ 239 VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_32, a_Memory, a_Vram, a_Diskspace, \ 240 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 241 242 #define VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_64(a_Id, a_Description, a_OStype, a_Memory, a_Vram, a_Diskspace) \ 243 VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_OStype, VBOX_LINUX_OSHINTS_A_64, a_Memory, a_Vram, a_Diskspace, \ 244 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 245 246 /* Linux 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 */ 247 #define VBOX_LINUX_SUBTYPE_B_32(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 248 VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_32, a_Memory, a_Vram, a_Diskspace, \ 249 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 250 251 /* 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 */ 252 #define VBOX_LINUX_SUBTYPE_B_64(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 253 VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_B_64, a_Memory, a_Vram, a_Diskspace, \ 254 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 255 256 /* Linux 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */ 257 #define VBOX_LINUX_SUBTYPE_C_32(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 258 VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_32, a_Memory, a_Vram, a_Diskspace, \ 259 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 260 261 /* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/Intel-Pro1000/PIIX4+IDE DVD/AHCI+SATA disk/AC97 */ 262 #define VBOX_LINUX_SUBTYPE_C_64(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 263 VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_64, a_Memory, a_Vram, a_Diskspace, \ 264 NetworkAdapterType_I82540EM, StorageControllerType_IntelAhci, StorageBus_SATA) 265 266 /* Linux 32-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */ 267 #define VBOX_LINUX_SUBTYPE_D_32(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 268 VBOX_LINUX_SUBTYPE_TEMPLATE_32(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_32, a_Memory, a_Vram, a_Diskspace, \ 269 NetworkAdapterType_Am79C973, StorageControllerType_PIIX4, StorageBus_IDE) 270 271 /* Linux 64-bit sub-type template defaulting to 1 CPU with PS/2-mouse/VMSVGA/PCnet-FASTIII/PIIX4+IDE DVD/PIIX4+IDE disk/AC97 */ 272 #define VBOX_LINUX_SUBTYPE_D_64(a_Id, a_Description, a_Memory, a_Vram, a_Diskspace) \ 273 VBOX_LINUX_SUBTYPE_TEMPLATE_64(a_Id, a_Description, a_Id, VBOX_LINUX_OSHINTS_C_64, a_Memory, a_Vram, a_Diskspace, \ 274 NetworkAdapterType_I82540EM, StorageControllerType_PIIX4, StorageBus_IDE) 275 276 VBOX_LINUX_SUBTYPE_D_32(Linux22, "Linux 2.2 (32-bit)", 64, 4, 2), 277 VBOX_LINUX_SUBTYPE_D_32(Linux24, "Linux 2.4 (32-bit)", 128, 16, 2), 278 VBOX_LINUX_SUBTYPE_A_64(Linux24, "Linux 2.4 (64-bit)", 1024, 16, 4), 279 VBOX_LINUX_SUBTYPE_A_32(Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (32-bit)", 1024, 16, 8), 280 VBOX_LINUX_SUBTYPE_A_64(Linux26, "Linux 2.6 / 3.x / 4.x / 5.x (64-bit)", 1024, 16, 8), 281 282 VBOX_LINUX_SUBTYPE_A_32(ArchLinux, "Arch Linux (32-bit)", 1024, 16, 8), 283 VBOX_LINUX_SUBTYPE_A_64(ArchLinux, "Arch Linux (64-bit)", 1024, 16, 8), 284 285 VBOX_LINUX_SUBTYPE_A_32(Debian, "Debian (32-bit)", 2048, 16, 20), 286 VBOX_LINUX_SUBTYPE_A_64(Debian, "Debian (64-bit)", 2048, 16, 20), 287 VBOX_LINUX_SUBTYPE_A_32(Debian31, "Debian 3.1 Sarge (32-bit)", 1024, 16, 8), // 32-bit only 288 VBOX_LINUX_SUBTYPE_A_32(Debian4, "Debian 4.0 Etch (32-bit)", 1024, 16, 8), 289 VBOX_LINUX_SUBTYPE_A_64(Debian4, "Debian 4.0 Etch (64-bit)", 1024, 16, 8), 290 VBOX_LINUX_SUBTYPE_A_32(Debian5, "Debian 5.0 Lenny (32-bit)", 1024, 16, 8), 291 VBOX_LINUX_SUBTYPE_A_64(Debian5, "Debian 5.0 Lenny (64-bit)", 1024, 16, 8), 292 VBOX_LINUX_SUBTYPE_A_32(Debian6, "Debian 6.0 Squeeze (32-bit)", 1024, 16, 8), 293 VBOX_LINUX_SUBTYPE_A_64(Debian6, "Debian 6.0 Squeeze (64-bit)", 1024, 16, 8), 294 VBOX_LINUX_SUBTYPE_A_32(Debian7, "Debian 7 Wheezy (32-bit)", 2048, 16, 20), 295 VBOX_LINUX_SUBTYPE_A_64(Debian7, "Debian 7 Wheezy (64-bit)", 2048, 16, 20), 296 VBOX_LINUX_SUBTYPE_A_32(Debian8, "Debian 8 Jessie (32-bit)", 2048, 16, 20), 297 VBOX_LINUX_SUBTYPE_A_64(Debian8, "Debian 8 Jessie (64-bit)", 2048, 16, 20), 298 VBOX_LINUX_SUBTYPE_A_32(Debian9, "Debian 9 Stretch (32-bit)", 2048, 16, 20), 299 VBOX_LINUX_SUBTYPE_A_64(Debian9, "Debian 9 Stretch (64-bit)", 2048, 16, 20), 300 VBOX_LINUX_SUBTYPE_A_32(Debian10, "Debian 10 Buster (32-bit)", 2048, 16, 20), 301 VBOX_LINUX_SUBTYPE_A_64(Debian10, "Debian 10 Buster (64-bit)", 2048, 16, 20), 302 VBOX_LINUX_SUBTYPE_A_32(Debian11, "Debian 11 Bullseye (32-bit)", 2048, 16, 20), 303 VBOX_LINUX_SUBTYPE_A_64(Debian11, "Debian 11 Bullseye (64-bit)", 2048, 16, 20), 304 305 VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_32(Fedora, "Fedora Linux (32-bit)", FedoraCore, 2048, 16, 15), 306 VBOX_LINUX_SUBTYPE_A_WITH_OSTYPE_64(Fedora, "Fedora Linux (64-bit)", FedoraCore, 2048, 16, 15), 307 308 VBOX_LINUX_SUBTYPE_A_32(Gentoo, "Gentoo Linux (32-bit)", 1024, 16, 8), 309 VBOX_LINUX_SUBTYPE_A_64(Gentoo, "Gentoo Linux (64-bit)", 1024, 16, 8), 310 311 VBOX_LINUX_SUBTYPE_A_32(Mandriva, "Mandriva Linux (32-bit)", 1024, 16, 8), 312 VBOX_LINUX_SUBTYPE_A_64(Mandriva, "Mandriva Linux (64-bit)", 1024, 16, 8), 313 VBOX_LINUX_SUBTYPE_A_32(OpenMandriva_Lx, "OpenMandriva Lx (32-bit)", 2048, 16, 10), 314 VBOX_LINUX_SUBTYPE_A_64(OpenMandriva_Lx, "OpenMandriva Lx (64-bit)", 2048, 16, 10), 315 VBOX_LINUX_SUBTYPE_A_32(PCLinuxOS, "PCLinuxOS / PCLOS (32-bit)", 2048, 16, 10), 316 VBOX_LINUX_SUBTYPE_A_64(PCLinuxOS, "PCLinuxOS / PCLOS (64-bit)", 2048, 16, 10), 317 VBOX_LINUX_SUBTYPE_A_32(Mageia, "Mageia (32-bit)", 2048, 16, 10), 318 VBOX_LINUX_SUBTYPE_A_64(Mageia, "Mageia (64-bit)", 2048, 16, 10), 319 320 VBOX_LINUX_SUBTYPE_B_32(Oracle, "Oracle Linux (32-bit)", 2048, 16, 20), 321 VBOX_LINUX_SUBTYPE_B_64(Oracle, "Oracle Linux (64-bit)", 2048, 16, 20), 322 VBOX_LINUX_SUBTYPE_B_32(Oracle4, "Oracle Linux 4.x (32-bit)", 1024, 16, 8), 323 VBOX_LINUX_SUBTYPE_B_64(Oracle4, "Oracle Linux 4.x (64-bit)", 1024, 16, 8), 324 VBOX_LINUX_SUBTYPE_B_32(Oracle5, "Oracle Linux 5.x (32-bit)", 1024, 16, 8), 325 VBOX_LINUX_SUBTYPE_B_64(Oracle5, "Oracle Linux 5.x (64-bit)", 1024, 16, 8), 326 VBOX_LINUX_SUBTYPE_B_32(Oracle6, "Oracle Linux 6.x (32-bit)", 2048, 16, 10), 327 VBOX_LINUX_SUBTYPE_B_64(Oracle6, "Oracle Linux 6.x (64-bit)", 2048, 16, 10), 328 VBOX_LINUX_SUBTYPE_B_64(Oracle7, "Oracle Linux 7.x (64-bit)", 2048, 16, 20), // 64-bit only 329 VBOX_LINUX_SUBTYPE_B_64(Oracle8, "Oracle Linux 8.x (64-bit)", 2048, 16, 20), // 64-bit only 330 331 VBOX_LINUX_SUBTYPE_B_32(RedHat, "Red Hat (32-bit)", 2048, 16, 20), 332 VBOX_LINUX_SUBTYPE_B_64(RedHat, "Red Hat (64-bit)", 2048, 16, 20), 333 VBOX_LINUX_SUBTYPE_B_32(RedHat3, "Red Hat 3.x (32-bit)", 1024, 16, 8), 334 VBOX_LINUX_SUBTYPE_B_64(RedHat3, "Red Hat 3.x (64-bit)", 1024, 16, 8), 335 VBOX_LINUX_SUBTYPE_B_32(RedHat4, "Red Hat 4.x (32-bit)", 1024, 16, 8), 336 VBOX_LINUX_SUBTYPE_B_64(RedHat4, "Red Hat 4.x (64-bit)", 1024, 16, 8), 337 VBOX_LINUX_SUBTYPE_B_32(RedHat5, "Red Hat 5.x (32-bit)", 1024, 16, 8), 338 VBOX_LINUX_SUBTYPE_B_64(RedHat5, "Red Hat 5.x (64-bit)", 1024, 16, 8), 339 VBOX_LINUX_SUBTYPE_B_32(RedHat6, "Red Hat 6.x (32-bit)", 1024, 16, 10), 340 VBOX_LINUX_SUBTYPE_B_64(RedHat6, "Red Hat 6.x (64-bit)", 1024, 16, 10), 341 VBOX_LINUX_SUBTYPE_B_64(RedHat7, "Red Hat 7.x (64-bit)", 2048, 16, 20), // 64-bit only 342 VBOX_LINUX_SUBTYPE_B_64(RedHat8, "Red Hat 8.x (64-bit)", 2048, 16, 20), // 64-bit only 343 344 VBOX_LINUX_SUBTYPE_A_32(OpenSUSE, "openSUSE Linux (32-bit)", 1024, 16, 8), 345 VBOX_LINUX_SUBTYPE_A_64(OpenSUSE, "openSUSE Linux (64-bit)", 1024, 16, 8), 346 VBOX_LINUX_SUBTYPE_A_64(OpenSUSE_Leap, "openSUSE Leap (64-bit)", 2048, 16, 8), // 64-bit only 347 VBOX_LINUX_SUBTYPE_A_32(OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (32-bit)", 2048, 16, 8), 348 VBOX_LINUX_SUBTYPE_A_64(OpenSUSE_Tumbleweed, "openSUSE Tumbleweed (64-bit)", 2048, 16, 8), 349 VBOX_LINUX_SUBTYPE_A_32(SUSE_LE, "SUSE Linux Enterprise (32-bit)", 2048, 16, 8), 350 VBOX_LINUX_SUBTYPE_A_64(SUSE_LE, "SUSE Linux Enterprise (64-bit)", 2048, 16, 8), 351 352 VBOX_LINUX_SUBTYPE_A_32(Turbolinux, "Turbolinux (32-bit)", 384, 16, 8), 353 VBOX_LINUX_SUBTYPE_A_64(Turbolinux, "Turbolinux (64-bit)", 384, 16, 8), 354 355 VBOX_LINUX_SUBTYPE_A_32(Ubuntu, "Ubuntu (32-bit)", 2048, 16, 25), 356 VBOX_LINUX_SUBTYPE_A_64(Ubuntu, "Ubuntu (64-bit)", 2048, 16, 25), 357 VBOX_LINUX_SUBTYPE_A_32(Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (32-bit)", 256, 16, 3), 358 VBOX_LINUX_SUBTYPE_A_64(Ubuntu10_LTS, "Ubuntu 10.04 LTS (Lucid Lynx) (64-bit)", 256, 16, 3), 359 VBOX_LINUX_SUBTYPE_A_32(Ubuntu10, "Ubuntu 10.10 (Maverick Meerkat) (32-bit)", 256, 16, 3), 360 VBOX_LINUX_SUBTYPE_A_64(Ubuntu10, "Ubuntu 10.10 (Maverick Meerkat) (64-bit)", 256, 16, 3), 361 VBOX_LINUX_SUBTYPE_A_32(Ubuntu11, "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (32-bit)", 384, 16, 5), 362 VBOX_LINUX_SUBTYPE_A_64(Ubuntu11, "Ubuntu 11.04 (Natty Narwhal) / 11.10 (Oneiric Ocelot) (64-bit)", 384, 16, 5), 363 VBOX_LINUX_SUBTYPE_A_32(Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (32-bit)", 768, 16, 5), 364 VBOX_LINUX_SUBTYPE_A_64(Ubuntu12_LTS, "Ubuntu 12.04 LTS (Precise Pangolin) (64-bit)", 768, 16, 5), 365 VBOX_LINUX_SUBTYPE_A_32(Ubuntu12, "Ubuntu 12.10 (Quantal Quetzal) (32-bit)", 768, 16, 5), 366 VBOX_LINUX_SUBTYPE_A_64(Ubuntu12, "Ubuntu 12.10 (Quantal Quetzal) (64-bit)", 768, 16, 5), 367 VBOX_LINUX_SUBTYPE_A_32(Ubuntu13, "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (32-bit)", 768, 16, 5), 368 VBOX_LINUX_SUBTYPE_A_64(Ubuntu13, "Ubuntu 13.04 (Raring Ringtail) / 13.10 (Saucy Salamander) (64-bit)", 768, 16, 5), 369 VBOX_LINUX_SUBTYPE_A_32(Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (32-bit)", 1536, 16, 7), 370 VBOX_LINUX_SUBTYPE_A_64(Ubuntu14_LTS, "Ubuntu 14.04 LTS (Trusty Tahr) (64-bit)", 1536, 16, 7), 371 VBOX_LINUX_SUBTYPE_A_32(Ubuntu14, "Ubuntu 14.10 (Utopic Unicorn) (32-bit)", 1536, 16, 7), 372 VBOX_LINUX_SUBTYPE_A_64(Ubuntu14, "Ubuntu 14.10 (Utopic Unicorn) (64-bit)", 1536, 16, 7), 373 VBOX_LINUX_SUBTYPE_A_32(Ubuntu15, "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (32-bit)", 1536, 16, 7), 374 VBOX_LINUX_SUBTYPE_A_64(Ubuntu15, "Ubuntu 15.04 (Vivid Vervet) / 15.10 (Wily Werewolf) (64-bit)", 1536, 16, 7), 375 VBOX_LINUX_SUBTYPE_A_32(Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (32-bit)", 1536, 16, 10), 376 VBOX_LINUX_SUBTYPE_A_64(Ubuntu16_LTS, "Ubuntu 16.04 LTS (Xenial Xerus) (64-bit)", 1536, 16, 10), 377 VBOX_LINUX_SUBTYPE_A_32(Ubuntu16, "Ubuntu 16.10 (Yakkety Yak) (32-bit)", 1536, 16, 10), 378 VBOX_LINUX_SUBTYPE_A_64(Ubuntu16, "Ubuntu 16.10 (Yakkety Yak) (64-bit)", 1536, 16, 10), 379 VBOX_LINUX_SUBTYPE_A_32(Ubuntu17, "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (32-bit)", 1536, 16, 10), 380 VBOX_LINUX_SUBTYPE_A_64(Ubuntu17, "Ubuntu 17.04 (Zesty Zapus) / 17.10 (Artful Aardvark) (64-bit)", 1536, 16, 10), 381 VBOX_LINUX_SUBTYPE_A_32(Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (32-bit)", 2048, 16, 25), 382 VBOX_LINUX_SUBTYPE_A_64(Ubuntu18_LTS, "Ubuntu 18.04 LTS (Bionic Beaver) (64-bit)", 2048, 16, 25), 383 VBOX_LINUX_SUBTYPE_A_32(Ubuntu18, "Ubuntu 18.10 (Cosmic Cuttlefish) (32-bit)", 2048, 16, 25), 384 VBOX_LINUX_SUBTYPE_A_64(Ubuntu18, "Ubuntu 18.10 (Cosmic Cuttlefish) (64-bit)", 2048, 16, 25), 385 VBOX_LINUX_SUBTYPE_A_32(Ubuntu19, "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (32-bit)", 2048, 16, 25), 386 VBOX_LINUX_SUBTYPE_A_64(Ubuntu19, "Ubuntu 19.04 (Disco Dingo) / 19.10 (Eoan Ermine) (64-bit)", 2048, 16, 25), 387 VBOX_LINUX_SUBTYPE_A_64(Ubuntu20_LTS, "Ubuntu 20.04 LTS (Focal Fossa) (64-bit)", 2048, 16, 25), // 64-bit only 388 VBOX_LINUX_SUBTYPE_A_64(Ubuntu20, "Ubuntu 20.10 (Groovy Gorilla) (64-bit)", 2048, 16, 25), // 64-bit only 389 VBOX_LINUX_SUBTYPE_A_64(Ubuntu21, "Ubuntu 21.04 (Hirsute Hippo) / 21.10 (Impish Indri) (64-bit)", 2048, 16, 25), // 64-bit only 390 VBOX_LINUX_SUBTYPE_A_64(Ubuntu22_LTS, "Ubuntu 22.04 LTS (Jammy Jellyfish) (64-bit)", 2048, 16, 25), // 64-bit only 391 VBOX_LINUX_SUBTYPE_A_32(Lubuntu, "Lubuntu (32-bit)", 1024, 16, 10), 392 VBOX_LINUX_SUBTYPE_A_64(Lubuntu, "Lubuntu (64-bit)", 1024, 16, 10), 393 VBOX_LINUX_SUBTYPE_A_32(Xubuntu, "Xubuntu (32-bit)", 1024, 16, 10), 394 VBOX_LINUX_SUBTYPE_A_64(Xubuntu, "Xubuntu (64-bit)", 1024, 16, 10), 395 396 VBOX_LINUX_SUBTYPE_C_32(Xandros, "Xandros (32-bit)", 1024, 16, 8), 397 VBOX_LINUX_SUBTYPE_C_64(Xandros, "Xandros (64-bit)", 1024, 16, 8), 398 399 VBOX_LINUX_SUBTYPE_D_32(Linux, "Other Linux (32-bit)", 256, 16, 8), 400 VBOX_LINUX_SUBTYPE_D_64(Linux, "Other Linux (64-bit)", 512, 16, 8), 357 401 358 402 { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier (32-bit)", -
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r93480 r94460 131 131 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, 132 132 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, 133 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat3 }, 134 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat3_x64 }, 135 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat4 }, 136 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat4_x64 }, 137 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat5 }, 138 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat5_x64 }, 139 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat6 }, 140 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat6_x64 }, 141 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat7_x64 }, // 64-bit only 142 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat8_x64 }, // 64-bit only 133 143 { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, 134 144 { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE }, 135 { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_ OpenSUSE },145 { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_SUSE_LE }, 136 146 { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, VBOXOSTYPE_OpenSUSE }, 137 147 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_x64 }, 138 { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_OpenSUSE_x64 }, 148 { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_SUSE_LE_x64 }, 149 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Leap_x64 }, // 64-bit only 150 { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE_Tumbleweed }, 151 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Tumbleweed_x64 }, 139 152 { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux }, 140 153 { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 }, … … 144 157 { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, 145 158 { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, 159 { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_OpenMandriva_Lx }, 160 { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_OpenMandriva_Lx_x64 }, 161 { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_PCLinuxOS }, 162 { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_PCLinuxOS_x64 }, 163 { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mageia }, 164 { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mageia_x64 }, 146 165 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, 147 166 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, 167 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu10_LTS }, 168 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu10_LTS_x64 }, 169 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu10 }, 170 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu10_x64 }, 171 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu11 }, 172 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu11_x64 }, 173 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu12_LTS }, 174 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu12_LTS_x64 }, 175 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu12 }, 176 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu12_x64 }, 177 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu13 }, 178 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu13_x64 }, 179 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu14_LTS }, 180 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu14_LTS_x64 }, 181 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu14 }, 182 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu14_x64 }, 183 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu15 }, 184 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu15_x64 }, 185 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu16_LTS }, 186 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu16_LTS_x64 }, 187 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu16 }, 188 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu16_x64 }, 189 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu17 }, 190 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu17_x64 }, 191 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu18_LTS }, 192 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu18_LTS_x64 }, 193 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu18 }, 194 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu18_x64 }, 195 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu19 }, 196 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu19_x64 }, 197 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu20_LTS_x64 }, 198 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu20_x64 }, 199 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu21_x64 }, 200 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu22_LTS_x64 }, 201 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu22_x64 }, 202 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Lubuntu }, 203 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Lubuntu_x64 }, 204 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Xubuntu }, 205 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Xubuntu_x64 }, 148 206 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, 149 207 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, 208 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian31 }, 209 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian4 }, 210 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian4_x64 }, 211 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian5 }, 212 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian5_x64 }, 213 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian6 }, 214 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian6_x64 }, 215 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian7 }, 216 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian7_x64 }, 217 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian8 }, 218 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian8_x64 }, 219 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian9 }, 220 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian9_x64 }, 221 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian10 }, 222 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian10_x64 }, 223 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian11 }, 224 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian11_x64 }, 150 225 { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, 151 226 { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, … … 176 251 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle }, 177 252 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle_x64 }, 253 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle4 }, 254 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle4_x64 }, 255 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle5 }, 256 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle5_x64 }, 257 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle6 }, 258 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle6_x64 }, 259 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle7_x64 }, // 64-bit only 260 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle8_x64 }, // 64-bit only 178 261 { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS }, 179 262 -
trunk/src/VBox/Main/src-server/MachineImpl.cpp
r94394 r94460 1393 1393 *aParavirtProvider = ParavirtProvider_HyperV; 1394 1394 } 1395 else if ( mUserData->s.strOsType == "Linux26" // Linux22 and Linux24 omitted as they're too old 1396 || mUserData->s.strOsType == "Linux26_64" // for having any KVM paravirtualization support. 1397 || mUserData->s.strOsType == "Linux" 1398 || mUserData->s.strOsType == "Linux_64" 1399 || mUserData->s.strOsType == "ArchLinux" 1400 || mUserData->s.strOsType == "ArchLinux_64" 1401 || mUserData->s.strOsType == "Debian" 1402 || mUserData->s.strOsType == "Debian_64" 1403 || mUserData->s.strOsType == "Fedora" 1404 || mUserData->s.strOsType == "Fedora_64" 1405 || mUserData->s.strOsType == "Gentoo" 1406 || mUserData->s.strOsType == "Gentoo_64" 1407 || mUserData->s.strOsType == "Mandriva" 1408 || mUserData->s.strOsType == "Mandriva_64" 1409 || mUserData->s.strOsType == "OpenSUSE" 1410 || mUserData->s.strOsType == "OpenSUSE_64" 1411 || mUserData->s.strOsType == "Oracle" 1412 || mUserData->s.strOsType == "Oracle_64" 1413 || mUserData->s.strOsType == "RedHat" 1414 || mUserData->s.strOsType == "RedHat_64" 1415 || mUserData->s.strOsType == "Turbolinux" 1416 || mUserData->s.strOsType == "Turbolinux_64" 1417 || mUserData->s.strOsType == "Ubuntu" 1418 || mUserData->s.strOsType == "Ubuntu_64" 1419 || mUserData->s.strOsType == "Xandros" 1420 || mUserData->s.strOsType == "Xandros_64") 1395 else if (guestTypeFamilyId == "Linux" && 1396 mUserData->s.strOsType != "Linux22" && // Linux22 and Linux24{_64} excluded as they're too old 1397 mUserData->s.strOsType != "Linux24" && // to have any KVM paravirtualization support. 1398 mUserData->s.strOsType != "Linux24_64") 1421 1399 { 1422 1400 *aParavirtProvider = ParavirtProvider_KVM; -
trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp
r94348 r94460 68 68 else 69 69 { 70 if (enmDetectedOSType == VBOXOSTYPE_Debian || enmDetectedOSType == VBOXOSTYPE_Debian_x64)70 if (enmDetectedOSType >= VBOXOSTYPE_Debian && enmDetectedOSType <= VBOXOSTYPE_Debian_latest_x64) 71 71 pUinstaller = new UnattendedDebianInstaller(pParent); 72 else if (enmDetectedOSType >= VBOXOSTYPE_Ubuntu && enmDetectedOSType <= VBOXOSTYPE_Ubuntu_ x64)72 else if (enmDetectedOSType >= VBOXOSTYPE_Ubuntu && enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_x64) 73 73 pUinstaller = new UnattendedUbuntuInstaller(pParent); 74 else if (enmDetectedOSType >= VBOXOSTYPE_RedHat && enmDetectedOSType <= VBOXOSTYPE_RedHat_ x64)74 else if (enmDetectedOSType >= VBOXOSTYPE_RedHat && enmDetectedOSType <= VBOXOSTYPE_RedHat_latest_x64) 75 75 { 76 76 if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0) … … 91 91 else if (enmDetectedOSType >= VBOXOSTYPE_FedoraCore && enmDetectedOSType <= VBOXOSTYPE_FedoraCore_x64) 92 92 pUinstaller = new UnattendedFedoraInstaller(pParent); 93 else if (enmDetectedOSType >= VBOXOSTYPE_Oracle && enmDetectedOSType <= VBOXOSTYPE_Oracle_ x64)93 else if (enmDetectedOSType >= VBOXOSTYPE_Oracle && enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_x64) 94 94 { 95 95 if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0)
Note:
See TracChangeset
for help on using the changeset viewer.
