Changeset 107248 in vbox for trunk/src/VBox/Main
- Timestamp:
- Dec 6, 2024 10:25:21 PM (3 months ago)
- svn:sync-xref-src-repo-rev:
- 166266
- Location:
- trunk/src/VBox/Main
- Files:
-
- 2 edited
-
src-all/Global.cpp (modified) (4 diffs)
-
src-server/ApplianceImpl.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-all/Global.cpp
r107121 r107248 201 201 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, 202 202 203 { "Windows", "Microsoft Windows", "", GUEST_OS_ID_STR_A64("Windows10"), "Windows 10 on ARM (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN_A64, VBOX_OSTYPE_ARM64(Win1 1), VBOXOSHINT_64BIT | VBOXOSHINT_EFI | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_EFI_SECUREBOOT | VBOXOSHINT_TPM2 | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBHID,203 { "Windows", "Microsoft Windows", "", GUEST_OS_ID_STR_A64("Windows10"), "Windows 10 on ARM (64-bit)", VBOX_GUEST_ADDITIONS_NAME_WIN_A64, VBOX_OSTYPE_ARM64(Win10), VBOXOSHINT_64BIT | VBOXOSHINT_EFI | VBOXOSHINT_USBTABLET | VBOXOSHINT_USB3 | VBOXOSHINT_EFI_SECUREBOOT | VBOXOSHINT_TPM2 | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBHID, 204 204 2, 4096, 128, 50 * _1G64, GraphicsControllerType_QemuRamFB, NetworkAdapterType_I82540EM, 0, StorageControllerType_VirtioSCSI, StorageBus_VirtioSCSI, 205 205 StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_ARMv8Virtual, IommuType_None, AudioControllerType_HDA, AudioCodecType_STAC9221 }, … … 406 406 VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle6, "Oracle Linux 6.x (64-bit)", 2048, 16, 10), 407 407 VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle7, "Oracle Linux 7.x (64-bit)", 2048, 16, 20), // 64-bit only 408 VBOX_LINUX_SUBTYPE_B_A64("Oracle Linux", Oracle7, "Oracle Linux 7.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only 408 409 VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle8, "Oracle Linux 8.x (64-bit)", 2048, 16, 20), // 64-bit only 410 VBOX_LINUX_SUBTYPE_B_A64("Oracle Linux", Oracle8, "Oracle Linux 8.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only 409 411 VBOX_LINUX_SUBTYPE_B_X64("Oracle Linux", Oracle9, "Oracle Linux 9.x (64-bit)", 2048, 16, 20), // 64-bit only 410 412 VBOX_LINUX_SUBTYPE_B_A64("Oracle Linux", Oracle9, "Oracle Linux 9.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only … … 421 423 VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat6, "Red Hat 6.x (64-bit)", 1024, 16, 10), 422 424 VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat7, "Red Hat 7.x (64-bit)", 2048, 16, 20), // 64-bit only 425 VBOX_LINUX_SUBTYPE_B_A64("Red Hat", RedHat7, "Red Hat 7.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only 423 426 VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat8, "Red Hat 8.x (64-bit)", 2048, 16, 20), // 64-bit only 427 VBOX_LINUX_SUBTYPE_B_A64("Red Hat", RedHat8, "Red Hat 8.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only 424 428 VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat9, "Red Hat 9.x (64-bit)", 2048, 16, 20), // 64-bit only 429 VBOX_LINUX_SUBTYPE_B_X64("Red Hat", RedHat9, "Red Hat 9.x (ARM 64-bit)", 2048, 16, 20), // 64-bit only 425 430 426 431 VBOX_LINUX_SUBTYPE_A_X86("openSUSE", OpenSUSE, "openSUSE (32-bit)", 1024, 16, 8), … … 478 483 VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu23, "Ubuntu 23.04 (Lunar Lobster) (64-bit)", 2048, 16, 25), // 64-bit only 479 484 VBOX_LINUX_SUBTYPE_A_A64("Ubuntu", Ubuntu23, "Ubuntu 23.04 (Lunar Lobster) (ARM 64-bit)", 2048, 16, 25), 485 VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu231, "Ubuntu 23.10 (Mantic Minotaur) (64-bit)", 2048, 16, 25), // 64-bit only 486 VBOX_LINUX_SUBTYPE_A_A64("Ubuntu", Ubuntu231, "Ubuntu 23.10 (Mantic Minotaur) (ARM 64-bit)", 2048, 16, 25), // 64-bit only 480 487 VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu24_LTS, "Ubuntu 24.04 LTS (Noble Numbat) (64-bit)", 2048, 16, 25), // 64-bit only 481 488 VBOX_LINUX_SUBTYPE_A_A64("Ubuntu", Ubuntu24_LTS, "Ubuntu 24.04 LTS (Noble Numbat) (ARM 64-bit)", 2048, 16, 25), 489 VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Ubuntu24, "Ubuntu 24.10 (Oracular Oriole) (64-bit)", 2048, 16, 25), // 64-bit only 490 VBOX_LINUX_SUBTYPE_A_A64("Ubuntu", Ubuntu24, "Ubuntu 24.10 (Oracular Oriole) (ARM 64-bit)", 2048, 16, 25), 482 491 VBOX_LINUX_SUBTYPE_A_X86("Ubuntu", Lubuntu, "Lubuntu (32-bit)", 1024, 16, 10), 483 492 VBOX_LINUX_SUBTYPE_A_X64("Ubuntu", Lubuntu, "Lubuntu (64-bit)", 1024, 16, 10), -
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r107121 r107248 91 91 { 92 92 { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown }, 93 { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown_x64 }, 94 { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown_arm64 }, 93 95 { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2 }, 94 96 { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp3 }, … … 129 131 { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, VBOXOSTYPE_Win2k8_x64 }, 130 132 { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 }, 133 { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_arm64 }, 131 134 { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, 132 135 { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this … … 152 155 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat6 }, 153 156 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat6_x64 }, 154 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat7_x64 }, // 64-bit only 155 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat8_x64 }, // 64-bit only 156 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat9_x64 }, // 64-bit only 157 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat7_x64 }, // 64-bit only 158 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat7_arm64 }, // 64-bit only 159 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat8_x64 }, // 64-bit only 160 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat8_arm64 }, // 64-bit only 161 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat9_x64 }, // 64-bit only 162 { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat9_arm64 }, // 64-bit only 157 163 { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE }, 158 164 { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_SUSE_LE }, … … 161 167 { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_SUSE_LE_x64 }, 162 168 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Leap_x64 }, // 64-bit only 169 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Leap_arm64 }, // 64-bit only 163 170 { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE_Tumbleweed }, 164 171 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Tumbleweed_x64 }, 172 { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_Tumbleweed_arm64 }, 165 173 { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux }, 166 174 { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 }, … … 178 186 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, 179 187 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, 188 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_arm64 }, 180 189 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu10_LTS }, 181 190 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu10_LTS_x64 }, … … 213 222 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu22_LTS_x64 }, 214 223 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu22_x64 }, 224 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu22_arm64 }, 215 225 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu23_x64 }, 226 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu23_arm64 }, 227 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu231_x64 }, 228 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu231_arm64 }, 229 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu24_LTS_x64 }, 230 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu24_LTS_arm64 }, 231 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu24_x64 }, 232 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu24_arm64 }, 216 233 { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Lubuntu }, 217 234 { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Lubuntu_x64 }, … … 220 237 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, 221 238 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, 239 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_arm64 }, 222 240 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian31 }, 223 241 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian4 }, … … 233 251 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian9 }, 234 252 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian9_x64 }, 253 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian9_arm64 }, 235 254 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian10 }, 236 255 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian10_x64 }, 256 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian10_arm64 }, 237 257 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian11 }, 238 258 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian11_x64 }, 259 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian11_arm64 }, 239 260 { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian12 }, 240 261 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian12_x64 }, 262 { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian12_arm64 }, 241 263 { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, 242 264 { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, … … 248 270 { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, 249 271 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, 272 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_arm64 }, 250 273 { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, 251 274 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 }, 275 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_arm64 }, 252 276 { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo }, 253 277 { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 }, … … 267 291 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle }, 268 292 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle_x64 }, 293 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle_arm64 }, 269 294 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle4 }, 270 295 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle4_x64 }, … … 273 298 { ovf::CIMOSType_CIMOS_OracleLinux, VBOXOSTYPE_Oracle6 }, 274 299 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle6_x64 }, 275 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle7_x64 }, // 64-bit only 276 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle8_x64 }, // 64-bit only 277 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle9_x64 }, // 64-bit only 300 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle7_x64 }, // 64-bit only 301 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle7_arm64 }, // 64-bit only 302 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle8_x64 }, // 64-bit only 303 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle8_arm64 }, // 64-bit only 304 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle9_x64 }, // 64-bit only 305 { ovf::CIMOSType_CIMOS_OracleLinux_64, VBOXOSTYPE_Oracle9_arm64 }, // 64-bit only 278 306 { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS }, 279 307
Note:
See TracChangeset
for help on using the changeset viewer.
