Changeset 27820 in vbox
- Timestamp:
- Mar 30, 2010 12:37:16 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 59489
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/ostypes.h
r26333 r27820 94 94 VBOXOSTYPE_RedHat_x64 = 0x5A100, 95 95 VBOXOSTYPE_Turbolinux = 0x5B000, 96 VBOXOSTYPE_Turbolinux_x64 = 0x5B100, 96 97 VBOXOSTYPE_Ubuntu = 0x5C000, 97 98 VBOXOSTYPE_Ubuntu_x64 = 0x5C100, -
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
r27792 r27820 99 99 { QRegExp("((Red)|(rhel)).*64", Qt::CaseInsensitive), "RedHat_64" }, 100 100 { QRegExp("(Red)|(rhel)", Qt::CaseInsensitive), "RedHat" }, 101 { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, 101 102 { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" }, 102 103 { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" }, … … 701 702 m_Machine.SetHpetEnabled(type.GetRecommendedHpet()); 702 703 704 // Set UTC flags 705 m_Machine.SetRTCUseUTC(type.GetRecommendedRtcUseUtc()); 706 703 707 /* Register the VM prior to attaching hard disks */ 704 708 vbox.RegisterMachine(m_Machine); -
trunk/src/VBox/Main/Global.cpp
r27722 r27820 37 37 * '2GB' looks better than '1.95GB' (= 2000MB) */ 38 38 { "Other", "Other", SchemaDefs_OSTypeId_Other, "Other/Unknown", 39 VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 39 VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 40 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 40 41 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1", 41 VBOXOSTYPE_Win31, VBOXOSHINT_NONE, 32, 4, 1 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 42 VBOXOSTYPE_Win31, VBOXOSHINT_NONE, 43 32, 4, 1 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 42 44 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95", 43 VBOXOSTYPE_Win95, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 45 VBOXOSTYPE_Win95, VBOXOSHINT_NONE, 46 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 44 47 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98", 45 VBOXOSTYPE_Win98, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 48 VBOXOSTYPE_Win98, VBOXOSHINT_NONE, 49 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 46 50 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me", 47 VBOXOSTYPE_WinMe, VBOXOSHINT_NONE, 64, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 51 VBOXOSTYPE_WinMe, VBOXOSHINT_NONE, 52 64, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 48 53 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4, "Windows NT 4", 49 VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, 128, 16, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 54 VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, 55 128, 16, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 50 56 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000, "Windows 2000", 51 VBOXOSTYPE_Win2k, VBOXOSHINT_NONE, 168, 16, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 57 VBOXOSTYPE_Win2k, VBOXOSHINT_NONE, 58 168, 16, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 52 59 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP, "Windows XP", 53 VBOXOSTYPE_WinXP, VBOXOSHINT_NONE, 192, 16, 10 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 60 VBOXOSTYPE_WinXP, VBOXOSHINT_NONE, 61 192, 16, 10 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 54 62 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP_64, "Windows XP (64 bit)", 55 VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 192, 16, 10 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 63 VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64 192, 16, 10 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 56 65 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003, "Windows 2003", 57 VBOXOSTYPE_Win2k3, VBOXOSHINT_NONE, 256, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 66 VBOXOSTYPE_Win2k3, VBOXOSHINT_NONE, 67 256, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 58 68 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003_64, "Windows 2003 (64 bit)", 59 VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 69 VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 70 256, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 60 71 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista, "Windows Vista", 61 VBOXOSTYPE_WinVista, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 72 VBOXOSTYPE_WinVista, VBOXOSHINT_NONE, 73 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 62 74 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista_64, "Windows Vista (64 bit)", 63 VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 75 VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 76 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 64 77 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008, "Windows 2008", 65 VBOXOSTYPE_Win2k8, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 78 VBOXOSTYPE_Win2k8, VBOXOSHINT_NONE, 79 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 66 80 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64, "Windows 2008 (64 bit)", 67 VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 81 VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 82 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 68 83 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7, "Windows 7", 69 VBOXOSTYPE_Win7, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 84 VBOXOSTYPE_Win7, VBOXOSHINT_NONE, 85 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 70 86 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64, "Windows 7 (64 bit)", 71 VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 87 VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 88 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 72 89 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows", 73 VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 90 VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 91 512, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 74 92 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2", 75 VBOXOSTYPE_Linux22, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 93 VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, 94 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 76 95 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4", 77 VBOXOSTYPE_Linux24, VBOXOSHINT_NONE, 128, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 96 VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, 97 128, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 78 98 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24_64, "Linux 2.4 (64 bit)", 79 VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 99 VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 100 128, 4, 4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 80 101 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6", 81 VBOXOSTYPE_Linux26, VBOXOSHINT_NONE, 256, 4, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 102 VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC, 103 256, 4, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 82 104 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)", 83 VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 4, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 105 VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 106 256, 4, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 84 107 { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux", 85 VBOXOSTYPE_ArchLinux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 108 VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC, 109 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 86 110 { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)", 87 VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 111 VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 112 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 88 113 { "Linux", "Linux", SchemaDefs_OSTypeId_Debian, "Debian", 89 VBOXOSTYPE_Debian, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 114 VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC, 115 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 90 116 { "Linux", "Linux", SchemaDefs_OSTypeId_Debian_64, "Debian (64 bit)", 91 VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 117 VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 118 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 92 119 { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE, "openSUSE", 93 VBOXOSTYPE_OpenSUSE, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 120 VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC, 121 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 94 122 { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE_64, "openSUSE (64 bit)", 95 VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 123 VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 124 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 96 125 { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora, "Fedora", 97 VBOXOSTYPE_FedoraCore, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 126 VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC, 127 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 98 128 { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora_64, "Fedora (64 bit)", 99 VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 129 VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 130 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 100 131 { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo, "Gentoo", 101 VBOXOSTYPE_Gentoo, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 132 VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC, 133 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 102 134 { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo_64, "Gentoo (64 bit)", 103 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 135 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 136 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 104 137 { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva", 105 VBOXOSTYPE_Mandriva, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 138 VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC, 139 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 106 140 { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva_64, "Mandriva (64 bit)", 107 VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 141 VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 142 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 108 143 { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat, "Red Hat", 109 VBOXOSTYPE_RedHat, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 144 VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC, 145 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 110 146 { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat_64, "Red Hat (64 bit)", 111 VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 147 VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 148 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 112 149 { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux", 113 VBOXOSTYPE_Turbolinux, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 150 VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC, 151 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 152 { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux", 153 VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 154 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 114 155 { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu", 115 VBOXOSTYPE_Ubuntu, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 156 VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC, 157 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 116 158 { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu_64, "Ubuntu (64 bit)", 117 VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 159 VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 160 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 118 161 { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", 119 VBOXOSTYPE_Xandros, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 162 VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, 163 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 120 164 { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", 121 VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 165 VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 166 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 122 167 { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", 123 VBOXOSTYPE_Oracle, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 168 VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC, 169 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 124 170 { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", 125 VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 171 VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, 172 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 126 173 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", 127 VBOXOSTYPE_Linux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 174 VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC, 175 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 128 176 { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris, "Solaris", 129 VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 177 VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 178 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 130 179 { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris_64, "Solaris (64 bit)", 131 VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 180 VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 181 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 132 182 { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "OpenSolaris", 133 VBOXOSTYPE_OpenSolaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 183 VBOXOSTYPE_OpenSolaris, VBOXOSHINT_NONE, 184 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 134 185 { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris_64, "OpenSolaris (64 bit)", 135 VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 186 VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 187 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 136 188 { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD", 137 VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 189 VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 190 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 138 191 { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD_64, "FreeBSD (64 bit)", 139 VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 192 VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 193 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 140 194 { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD, "OpenBSD", 141 VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 195 VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 196 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 142 197 { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD_64, "OpenBSD (64 bit)", 143 VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 198 VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 199 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 144 200 { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD, "NetBSD", 145 VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 201 VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 202 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 146 203 { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD_64, "NetBSD (64 bit)", 147 VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 204 VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 205 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 148 206 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3", 149 VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX, 48, 4, 1 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 207 VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX, 208 48, 4, 1 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 150 209 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4", 151 VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 210 VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX, 211 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 152 212 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5", 153 VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 213 VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX, 214 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 154 215 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation", 155 VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 216 VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 217 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 156 218 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2", 157 VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 219 VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX, 220 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4 }, 158 221 { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X", 159 VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 222 VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 223 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 160 224 { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X (64 bit)", 161 VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 225 VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, 226 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 162 227 { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS", 163 VBOXOSTYPE_DOS, VBOXOSHINT_NONE, 32, 4, 512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 228 VBOXOSTYPE_DOS, VBOXOSHINT_NONE, 229 32, 4, 512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 164 230 { "Other", "Other", SchemaDefs_OSTypeId_Netware, "Netware", 165 VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 231 VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 232 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 166 233 { "Other", "Other", SchemaDefs_OSTypeId_L4, "L4", 167 VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 234 VBOXOSTYPE_L4, VBOXOSHINT_NONE, 235 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 168 236 { "Other", "Other", SchemaDefs_OSTypeId_QNX, "QNX", 169 VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 237 VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 238 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 170 239 }; 171 240 -
trunk/src/VBox/Main/GuestOSTypeImpl.cpp
r27382 r27820 358 358 } 359 359 360 STDMETHODIMP GuestOSType::COMGETTER(RecommendedRtcUseUtc) (BOOL *aRecommendedRtcUseUtc) 361 { 362 CheckComArgOutPointerValid(aRecommendedRtcUseUtc); 363 364 AutoCaller autoCaller(this); 365 if (FAILED(autoCaller.rc())) return autoCaller.rc(); 366 367 /* HID type is constant during life time, no need to lock */ 368 *aRecommendedRtcUseUtc = !!(mOSHint & VBOXOSHINT_RTCUTC); 369 370 return S_OK; 371 } 372 360 373 /* vi: set tabstop=4 shiftwidth=4 expandtab: */ -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r27818 r27820 8445 8445 </attribute> 8446 8446 8447 <attribute name="recommendedRtcUseUtc" type="boolean" readonly="yes"> 8448 <desc>Returns @c true if the RTC of this VM should be set to UTC</desc> 8449 </attribute> 8450 8447 8451 </interface> 8448 8452 -
trunk/src/VBox/Main/include/Global.h
r27382 r27820 44 44 #define VBOXOSHINT_HPET RT_BIT(6) 45 45 #define VBOXOSHINT_USBTABLET RT_BIT(7) 46 #define VBOXOSHINT_RTCUTC RT_BIT(8) 46 47 47 48 /** -
trunk/src/VBox/Main/include/GuestOSTypeImpl.h
r27382 r27820 80 80 STDMETHOD(COMGETTER(RecommendedHpet)) (BOOL *aRecommendedHpet); 81 81 STDMETHOD(COMGETTER(RecommendedUsbTablet)) (BOOL *aRecommendedUsbTablet); 82 STDMETHOD(COMGETTER(RecommendedRtcUseUtc)) (BOOL *aRecommendedRtcUseUtc); 82 83 83 84 // public methods only for internal purposes -
trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd
r26333 r27820 187 187 <xsd:enumeration value="RedHat_64"/> 188 188 <xsd:enumeration value="Turbolinux"/> 189 <xsd:enumeration value="Turbolinux_64"/> 189 190 <xsd:enumeration value="Ubuntu"/> 190 191 <xsd:enumeration value="Ubuntu_64"/>
Note:
See TracChangeset
for help on using the changeset viewer.