Changeset 26389 in vbox
- Timestamp:
- Feb 9, 2010 4:28:52 PM (15 years ago)
- svn:sync-xref-src-repo-rev:
- 57484
- Location:
- trunk/src/VBox
- Files:
-
- 8 edited
-
Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (3 diffs)
-
Main/ConsoleImpl2.cpp (modified) (5 diffs)
-
Main/Global.cpp (modified) (1 diff)
-
Main/GuestOSTypeImpl.cpp (modified) (6 diffs)
-
Main/VirtualBoxImpl.cpp (modified) (1 diff)
-
Main/idl/VirtualBox.xidl (modified) (2 diffs)
-
Main/include/Global.h (modified) (2 diffs)
-
Main/include/GuestOSTypeImpl.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp
r26385 r26389 664 664 665 665 666 bool fExtHw = type.GetRecommendedExtHw();667 666 /* RAM size */ 668 667 m_Machine.SetMemorySize(field("ram").toInt()); … … 685 684 /* Create default storage controllers */ 686 685 QString ideCtrName = VBoxVMSettingsHD::tr("IDE Controller"); 687 QString floppyCtrName = VBoxVMSettingsHD::tr("Floppy Controller");688 686 KStorageBus ideBus = KStorageBus_IDE; 689 KStorageBus floppyBus = KStorageBus_Floppy; 690 687 688 // Add IDE controller 691 689 m_Machine.AddStorageController(ideCtrName, ideBus); 692 690 693 if (fExtHw) 694 { 695 // Set IDE controller type to ICH6 696 CStorageController ctr = m_Machine.GetStorageControllerByName(ideCtrName); 697 ctr.SetControllerType(KStorageControllerType_ICH6); 698 699 // Turn on PAE 700 m_Machine.SetCpuProperty(KCpuPropertyType_PAE, true); 701 702 // Add appropriate extra-data key 703 m_Machine.SetExtraData("VBoxInternal2/SupportExtHwProfile", "on"); 704 } 705 else 706 { 707 // Add floppy controller only into regular hardware profiles 708 m_Machine.AddStorageController(floppyCtrName, floppyBus); 709 } 710 691 // Set IDE controller type 692 CStorageController ctr = m_Machine.GetStorageControllerByName(ideCtrName); 693 KStorageControllerType storageControllerType = type.GetRecommendedStorageController(); 694 695 ctr.SetControllerType(storageControllerType); 696 697 // Turn on PAE, if recommended 698 m_Machine.SetCpuProperty(KCpuPropertyType_PAE, type.GetRecommendedPae()); 699 700 // Set recommended firmware type 711 701 KFirmwareType fwType = type.GetRecommendedFirmware(); 712 702 m_Machine.SetFirmwareType(fwType); … … 742 732 if (!m.isOk()) 743 733 vboxProblem().cannotAttachDevice(this, m, VBoxDefs::MediumType_DVD, QString(), ideBus, 1, 0); 744 745 /* Attach empty Floppy Device */746 if (!fExtHw)747 {748 m.AttachDevice(floppyCtrName, 0, 0, KDeviceType_Floppy, QString(""));749 if (!m.isOk())750 vboxProblem().cannotAttachDevice(this, m, VBoxDefs::MediumType_Floppy, QString(), floppyBus, 0, 0);751 }752 734 753 735 if (m.isOk()) -
trunk/src/VBox/Main/ConsoleImpl2.cpp
r26379 r26389 115 115 { 116 116 int rc; 117 /* 118 * Code based on Amit Singh SMC reading code sample in OS X Book, see 117 /* 118 * Code based on Amit Singh SMC reading code sample in OS X Book, see 119 119 * http://osxbook.com/book/bonus/chapter7/tpmdrmmyth/ 120 120 */ … … 331 331 332 332 BOOL fIOAPIC; 333 hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC); H(); 333 hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC); H(); 334 335 ComPtr<IGuestOSType> guestOSType; 336 hrc = virtualBox->GetGuestOSType(osTypeId, guestOSType.asOutParam()); H(); 334 337 335 338 /* … … 425 428 /** @todo This is currently only forced off on 32-bit hosts only because it 426 429 * makes a lof of difference there (REM and Solaris performance). 427 */ 428 429 ComPtr<IGuestOSType> guestOSType; 430 hrc = virtualBox->GetGuestOSType(osTypeId, guestOSType.asOutParam()); H(); 431 430 */ 432 431 BOOL fSupportsLongMode = false; 433 432 hrc = host->GetProcessorFeature(ProcessorFeature_LongMode, … … 585 584 #endif 586 585 587 /*588 * Temporary hack for enabling the next three devices and various ACPI features.589 */590 586 Bstr tmpStr2; 591 hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/SupportExtHwProfile"), tmpStr2.asOutParam()); H(); 592 BOOL fExtProfile = tmpStr2 == Bstr("on"); 587 hrc = guestOSType->COMGETTER(FamilyId)(tmpStr2.asOutParam()); H(); 588 /* 589 * Enable 3 following devices: HPET, SMC, LPC on MacOS X guests */ 590 BOOL fExtProfile = tmpStr2 == Bstr("MacOS"); 593 591 594 592 /* … … 597 595 BOOL fHpetEnabled; 598 596 #ifdef VBOX_WITH_HPET 597 /* Need ability to allow enabling HPET in other profiles too */ 599 598 fHpetEnabled = fExtProfile; 600 599 #else -
trunk/src/VBox/Main/Global.cpp
r26366 r26389 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 },39 VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 40 40 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1", 41 VBOXOSTYPE_Win31, VBOXOSHINT_NONE, 32, 4, 1 * _1K, NetworkAdapterType_Am79C973, 0 },41 VBOXOSTYPE_Win31, VBOXOSHINT_NONE, 32, 4, 1 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 42 42 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95", 43 VBOXOSTYPE_Win95, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },43 VBOXOSTYPE_Win95, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 44 44 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98", 45 VBOXOSTYPE_Win98, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },45 VBOXOSTYPE_Win98, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 46 46 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me", 47 VBOXOSTYPE_WinMe, VBOXOSHINT_NONE, 64, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0 },47 VBOXOSTYPE_WinMe, VBOXOSHINT_NONE, 64, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 48 48 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4, "Windows NT 4", 49 VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, 128, 16, 2 * _1K, NetworkAdapterType_Am79C973, 0 },49 VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, 128, 16, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 50 50 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000, "Windows 2000", 51 VBOXOSTYPE_Win2k, VBOXOSHINT_NONE, 168, 16, 4 * _1K, NetworkAdapterType_Am79C973, 0 },51 VBOXOSTYPE_Win2k, VBOXOSHINT_NONE, 168, 16, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 52 52 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP, "Windows XP", 53 VBOXOSTYPE_WinXP, VBOXOSHINT_NONE, 192, 16, 10 * _1K, NetworkAdapterType_Am79C973, 0 },53 VBOXOSTYPE_WinXP, VBOXOSHINT_NONE, 192, 16, 10 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 54 54 { "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 },55 VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 192, 16, 10 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 56 56 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003, "Windows 2003", 57 VBOXOSTYPE_Win2k3, VBOXOSHINT_NONE, 256, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0 },57 VBOXOSTYPE_Win2k3, VBOXOSHINT_NONE, 256, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4 }, 58 58 { "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 },59 VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 60 60 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista, "Windows Vista", 61 VBOXOSTYPE_WinVista, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0 },61 VBOXOSTYPE_WinVista, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 62 62 { "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 },63 VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 64 64 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008, "Windows 2008", 65 VBOXOSTYPE_Win2k8, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0 },65 VBOXOSTYPE_Win2k8, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 66 66 { "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 },67 VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 68 68 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7, "Windows 7", 69 VBOXOSTYPE_Win7, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0 },69 VBOXOSTYPE_Win7, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 70 70 { "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 },71 VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 512, 16, 20 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4 }, 72 72 { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows", 73 VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0 },73 VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, 512, 16, 20 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 74 74 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2", 75 VBOXOSTYPE_Linux22, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },75 VBOXOSTYPE_Linux22, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 76 76 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4", 77 VBOXOSTYPE_Linux24, VBOXOSHINT_NONE, 128, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0 },77 VBOXOSTYPE_Linux24, VBOXOSHINT_NONE, 128, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 78 78 { "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 },79 VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 4 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 80 80 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6", 81 VBOXOSTYPE_Linux26, VBOXOSHINT_NONE, 256, 4, 8 * _1K, NetworkAdapterType_Am79C973, 0 },81 VBOXOSTYPE_Linux26, VBOXOSHINT_NONE, 256, 4, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 82 82 { "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 },83 VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 4, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 84 84 { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux", 85 VBOXOSTYPE_ArchLinux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },85 VBOXOSTYPE_ArchLinux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 86 86 { "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 },87 VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 88 88 { "Linux", "Linux", SchemaDefs_OSTypeId_Debian, "Debian", 89 VBOXOSTYPE_Debian, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },89 VBOXOSTYPE_Debian, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 90 90 { "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 },91 VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 92 92 { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE, "openSUSE", 93 VBOXOSTYPE_OpenSUSE, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },93 VBOXOSTYPE_OpenSUSE, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 94 94 { "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 },95 VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 96 96 { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora, "Fedora", 97 VBOXOSTYPE_FedoraCore, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },97 VBOXOSTYPE_FedoraCore, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 98 98 { "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 },99 VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 100 100 { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo, "Gentoo", 101 VBOXOSTYPE_Gentoo, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },101 VBOXOSTYPE_Gentoo, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 102 102 { "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 },103 VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 104 104 { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva", 105 VBOXOSTYPE_Mandriva, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },105 VBOXOSTYPE_Mandriva, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 106 106 { "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 },107 VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 108 108 { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat, "Red Hat", 109 VBOXOSTYPE_RedHat, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },109 VBOXOSTYPE_RedHat, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 110 110 { "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 },111 VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 112 112 { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux", 113 VBOXOSTYPE_Turbolinux, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },113 VBOXOSTYPE_Turbolinux, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 114 114 { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu", 115 VBOXOSTYPE_Ubuntu, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },115 VBOXOSTYPE_Ubuntu, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 116 116 { "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 },117 VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 118 118 { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", 119 VBOXOSTYPE_Xandros, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },119 VBOXOSTYPE_Xandros, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 120 120 { "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 },121 VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 256, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 122 122 { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", 123 VBOXOSTYPE_Oracle, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },123 VBOXOSTYPE_Oracle, VBOXOSHINT_NONE, 384, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 124 124 { "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 },125 VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 384, 12, 8 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 126 126 { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", 127 VBOXOSTYPE_Linux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0 },127 VBOXOSTYPE_Linux, VBOXOSHINT_NONE, 256, 12, 8 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 128 128 { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris, "Solaris", 129 VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0 },129 VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 130 130 { "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 },131 VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 132 132 { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "OpenSolaris", 133 VBOXOSTYPE_OpenSolaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0 },133 VBOXOSTYPE_OpenSolaris, VBOXOSHINT_NONE, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 134 134 { "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 },135 VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 768, 12, 16 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 136 136 { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD", 137 VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0 },137 VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 138 138 { "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 },139 VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 128, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 140 140 { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD, "OpenBSD", 141 VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },141 VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 142 142 { "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 },143 VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 144 144 { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD, "NetBSD", 145 VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },145 VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 146 146 { "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 },147 VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, 64, 4, 2 * _1K, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX3 }, 148 148 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3", 149 VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX, 48, 4, 1 * _1K, NetworkAdapterType_Am79C973, 1 },149 VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX, 48, 4, 1 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX3 }, 150 150 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4", 151 VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1 },151 VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX3 }, 152 152 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5", 153 VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1 },153 VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX3 }, 154 154 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation", 155 VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1 },155 VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX3 }, 156 156 { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2", 157 VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1 },157 VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX, 96, 4, 2 * _1K, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX3 }, 158 158 { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS", 159 VBOXOSTYPE_DOS, VBOXOSHINT_NONE, 32, 4, 512, NetworkAdapterType_Am79C973, 0 },159 VBOXOSTYPE_DOS, VBOXOSHINT_NONE, 32, 4, 512, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 160 160 { "Other", "Other", SchemaDefs_OSTypeId_Netware, "Netware", 161 VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0 },161 VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 162 162 { "Other", "Other", SchemaDefs_OSTypeId_L4, "L4", 163 VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0 },163 VBOXOSTYPE_L4, VBOXOSHINT_NONE, 64, 4, 2 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 164 164 { "Other", "Other", SchemaDefs_OSTypeId_QNX, "QNX", 165 VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0 },165 VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, 512, 4, 4 * _1K, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX3 }, 166 166 { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X", 167 VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_ EXTHW, 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0},167 VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE, 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 168 168 { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X (64 bit)", 169 VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_ EXTHW | VBOXOSHINT_64BIT , 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0},169 VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT , 1024, 4, 20 * _1K, NetworkAdapterType_I82543GC, 0, StorageControllerType_ICH6 }, 170 170 }; 171 171 -
trunk/src/VBox/Main/GuestOSTypeImpl.cpp
r26333 r26389 35 35 , mNetworkAdapterType (NetworkAdapterType_Am79C973) 36 36 , mNumSerialEnabled (0) 37 , mStorageControllerType(StorageControllerType_PIIX3) 37 38 { 38 39 } … … 73 74 VBOXOSTYPE aOSType, uint32_t aOSHint, 74 75 uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize, 75 NetworkAdapterType_T aNetworkAdapterType, uint32_t aNumSerialEnabled) 76 NetworkAdapterType_T aNetworkAdapterType, 77 uint32_t aNumSerialEnabled, 78 StorageControllerType_T aStorageControllerType) 76 79 { 77 80 #if 0 … … 80 83 "aType=%d, aOSHint=%x, " 81 84 "aRAMSize=%d, aVRAMSize=%d, aHDDSize=%d, " 82 "aNetworkAdapterType=%d, aNumSerialEnabled=%d\n", 85 "aNetworkAdapterType=%d, aNumSerialEnabled=%d, " 86 "aStorageControllerType=%d\n", 83 87 aFamilyId, aFamilyDescription, 84 88 aId, aDescription, 85 89 aOSType, aOSHint, 86 90 aRAMSize, aVRAMSize, aHDDSize, 87 aNetworkAdapterType, aNumSerialEnabled)); 91 aNetworkAdapterType, 92 aNumSerialEnabled, 93 aStorageControllerType)); 88 94 #endif 89 95 … … 105 111 unconst(mNetworkAdapterType) = aNetworkAdapterType; 106 112 unconst(mNumSerialEnabled) = aNumSerialEnabled; 113 unconst(mStorageControllerType) = aStorageControllerType; 107 114 108 115 /* Confirm a successful initialization when it's the case */ … … 270 277 } 271 278 272 STDMETHODIMP GuestOSType::COMGETTER(Recommended ExtHw) (BOOL *aRecommendedExtHw)273 { 274 CheckComArgOutPointerValid(aRecommended ExtHw);275 276 AutoCaller autoCaller(this); 277 if (FAILED(autoCaller.rc())) return autoCaller.rc(); 278 279 /* recommended h/w profileis constant during life time, no need to lock */280 *aRecommended ExtHw = !!(mOSHint & VBOXOSHINT_EXTHW);279 STDMETHODIMP GuestOSType::COMGETTER(RecommendedPae) (BOOL *aRecommendedPae) 280 { 281 CheckComArgOutPointerValid(aRecommendedPae); 282 283 AutoCaller autoCaller(this); 284 if (FAILED(autoCaller.rc())) return autoCaller.rc(); 285 286 /* recommended PAE is constant during life time, no need to lock */ 287 *aRecommendedPae = !!(mOSHint & VBOXOSHINT_PAE); 281 288 282 289 return S_OK; … … 296 303 } 297 304 305 STDMETHODIMP GuestOSType::COMGETTER(RecommendedStorageController) (StorageControllerType_T * aStorageControllerType) 306 { 307 CheckComArgOutPointerValid(aStorageControllerType); 308 309 AutoCaller autoCaller(this); 310 if (FAILED(autoCaller.rc())) return autoCaller.rc(); 311 312 /* storage controller type is constant during life time, no need to lock */ 313 *aStorageControllerType = mStorageControllerType; 314 315 return S_OK; 316 } 317 318 298 319 /* vi: set tabstop=4 shiftwidth=4 expandtab: */ -
trunk/src/VBox/Main/VirtualBoxImpl.cpp
r26235 r26389 389 389 Global::sOSTypes[i].recommendedHDD, 390 390 Global::sOSTypes[i].networkAdapterType, 391 Global::sOSTypes[i].numSerialEnabled); 391 Global::sOSTypes[i].numSerialEnabled, 392 Global::sOSTypes[i].storageControllerType); 392 393 if (SUCCEEDED(rc)) 393 394 m->ollGuestOSTypes.addChild(guestOSTypeObj); -
trunk/src/VBox/Main/idl/VirtualBox.xidl
r26333 r26389 8207 8207 <interface 8208 8208 name="IGuestOSType" extends="$unknown" 8209 uuid=" c64386de-8689-4fa2-927b-d65d95986b45"8209 uuid="a44b7bab-bcfd-407b-8b4a-49877deb9d2d" 8210 8210 wsmap="struct" 8211 8211 > … … 8257 8257 </attribute> 8258 8258 8259 <attribute name="recommendedExtHw" type="boolean" readonly="yes"> 8260 <desc>Returns @c true if extended hardware profile is recommended for this OS type.</desc> 8259 <attribute name="recommendedPae" type="boolean" readonly="yes"> 8260 <desc>Returns @c true if using PAE is recommended for this OS type.</desc> 8261 </attribute> 8262 8263 <attribute name="recommendedStorageController" type="StorageControllerType" readonly="yes"> 8264 <desc>Recommended storage controller type.</desc> 8261 8265 </attribute> 8262 8266 -
trunk/src/VBox/Main/include/Global.h
r26333 r26389 40 40 #define VBOXOSHINT_IOAPIC RT_BIT(2) 41 41 #define VBOXOSHINT_EFI RT_BIT(3) 42 #define VBOXOSHINT_ EXTHWRT_BIT(4)42 #define VBOXOSHINT_PAE RT_BIT(4) 43 43 44 44 /** … … 53 53 struct OSType 54 54 { 55 const char *familyId; /* utf-8 */ 56 const char *familyDescription; /* utf-8 */ 57 const char *id; /* utf-8 */ 58 const char *description; /* utf-8 */ 59 const VBOXOSTYPE osType; 60 const uint32_t osHint; 61 const uint32_t recommendedRAM; 62 const uint32_t recommendedVRAM; 63 const uint32_t recommendedHDD; 64 const NetworkAdapterType_T networkAdapterType; 65 const uint32_t numSerialEnabled; 55 const char *familyId; /* utf-8 */ 56 const char *familyDescription; /* utf-8 */ 57 const char *id; /* utf-8 */ 58 const char *description; /* utf-8 */ 59 const VBOXOSTYPE osType; 60 const uint32_t osHint; 61 const uint32_t recommendedRAM; 62 const uint32_t recommendedVRAM; 63 const uint32_t recommendedHDD; 64 const NetworkAdapterType_T networkAdapterType; 65 const uint32_t numSerialEnabled; 66 const StorageControllerType_T storageControllerType; 66 67 }; 67 68 -
trunk/src/VBox/Main/include/GuestOSTypeImpl.h
r26333 r26389 58 58 VBOXOSTYPE aOSType, uint32_t aOSHint, 59 59 uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize, 60 NetworkAdapterType_T aNetworkAdapterType, uint32_t numSerialEnabled); 60 NetworkAdapterType_T aNetworkAdapterType, uint32_t numSerialEnabled, 61 StorageControllerType_T aStorageControllerType); 61 62 void uninit(); 62 63 … … 74 75 STDMETHOD(COMGETTER(AdapterType)) (NetworkAdapterType_T *aNetworkAdapterType); 75 76 STDMETHOD(COMGETTER(RecommendedFirmware)) (FirmwareType_T *aFirmwareType); 76 STDMETHOD(COMGETTER(RecommendedExtHw)) (BOOL *aRecommendedExtHw); 77 STDMETHOD(COMGETTER(RecommendedStorageController)) (StorageControllerType_T *aStorageControllerType); 78 STDMETHOD(COMGETTER(RecommendedPae)) (BOOL *aRecommendedExtHw); 77 79 78 80 // public methods only for internal purposes … … 81 83 bool recommendedIOAPIC() const { return !!(mOSHint & VBOXOSHINT_IOAPIC); } 82 84 bool recommendedVirtEx() const { return !!(mOSHint & VBOXOSHINT_HWVIRTEX); } 83 bool recommendedExtHw() const { return !!(mOSHint & VBOXOSHINT_EXTHW); }84 85 bool recommendedEFI() const { return !!(mOSHint & VBOXOSHINT_EFI); } 85 86 NetworkAdapterType_T networkAdapterType() const { return mNetworkAdapterType; } … … 103 104 const NetworkAdapterType_T mNetworkAdapterType; 104 105 const uint32_t mNumSerialEnabled; 106 const StorageControllerType_T mStorageControllerType; 105 107 }; 106 108
Note:
See TracChangeset
for help on using the changeset viewer.
