Changeset 94460 in vbox for trunk/src/VBox/Main
- Timestamp:
- Apr 4, 2022 8:30:21 PM (3 years ago)
- Location:
- trunk/src/VBox/Main
- Files:
-
- 4 edited
-
src-all/Global.cpp (modified) (1 diff)
-
src-server/ApplianceImpl.cpp (modified) (3 diffs)
-
src-server/MachineImpl.cpp (modified) (1 diff)
-
src-server/UnattendedInstaller.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
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.
