Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 27536) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (revision 27537) @@ -255,5 +255,5 @@ BOOL fSyntheticCpu; - machine->GetCpuProperty(CpuPropertyType_Synthetic, &fSyntheticCpu); + machine->GetCPUProperty(CPUPropertyType_Synthetic, &fSyntheticCpu); if (details == VMINFO_MACHINEREADABLE) RTPrintf("synthcpu=\"%s\"\n", fSyntheticCpu ? "on" : "off"); @@ -273,5 +273,5 @@ { ULONG uEAX, uEBX, uECX, uEDX; - rc = machine->GetCpuIdLeaf(uLeaf, &uEAX, &uEBX, &uECX, &uEDX); + rc = machine->GetCPUIDLeaf(uLeaf, &uEAX, &uEBX, &uECX, &uEDX); if (SUCCEEDED(rc)) { @@ -392,5 +392,5 @@ BOOL PAEEnabled; - machine->GetCpuProperty(CpuPropertyType_PAE, &PAEEnabled); + machine->GetCPUProperty(CPUPropertyType_PAE, &PAEEnabled); if (details == VMINFO_MACHINEREADABLE) RTPrintf("pae=\"%s\"\n", PAEEnabled ? "on" : "off"); Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (revision 27536) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (revision 27537) @@ -454,5 +454,5 @@ { ULONG uEAX, uEBX, uECX, uEDX, cLeafs; - CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, s_auCpuIdRanges[i], 0, &cLeafs, &uEBX, &uECX, &uEDX)); + CHECK_ERROR(Host, GetProcessorCPUIDLeaf(uCpuNo, s_auCpuIdRanges[i], 0, &cLeafs, &uEBX, &uECX, &uEDX)); if (cLeafs < s_auCpuIdRanges[i] || cLeafs > s_auCpuIdRanges[i+1]) continue; @@ -460,5 +460,5 @@ for (ULONG iLeaf = s_auCpuIdRanges[i]; iLeaf <= cLeafs; iLeaf++) { - CHECK_ERROR(Host, GetProcessorCpuIdLeaf(uCpuNo, iLeaf, 0, &uEAX, &uEBX, &uECX, &uEDX)); + CHECK_ERROR(Host, GetProcessorCPUIDLeaf(uCpuNo, iLeaf, 0, &uEAX, &uEBX, &uECX, &uEDX)); RTPrintf("%08x %08x %08x %08x %08x\n", iLeaf, uEAX, uEBX, uECX, uEDX); } Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 27536) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 27537) @@ -379,5 +379,5 @@ case MODIFYVM_PAE: { - CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_PAE, ValueUnion.f)); + CHECK_ERROR(machine, SetCPUProperty(CPUPropertyType_PAE, ValueUnion.f)); break; } @@ -385,5 +385,5 @@ case MODIFYVM_SYNTHCPU: { - CHECK_ERROR(machine, SetCpuProperty(CpuPropertyType_Synthetic, ValueUnion.f)); + CHECK_ERROR(machine, SetCPUProperty(CPUPropertyType_Synthetic, ValueUnion.f)); break; } @@ -415,5 +415,5 @@ aValue[i] = ValueUnion.u32; } - CHECK_ERROR(machine, SetCpuIdLeaf(id, aValue[0], aValue[1], aValue[2], aValue[3])); + CHECK_ERROR(machine, SetCPUIDLeaf(id, aValue[0], aValue[1], aValue[2], aValue[3])); break; } @@ -421,5 +421,5 @@ case MODIFYVM_DELCPUID: { - CHECK_ERROR(machine, RemoveCpuIdLeaf(ValueUnion.u32)); + CHECK_ERROR(machine, RemoveCPUIDLeaf(ValueUnion.u32)); break; } @@ -427,5 +427,5 @@ case MODIFYVM_DELALLCPUID: { - CHECK_ERROR(machine, RemoveAllCpuIdLeafs()); + CHECK_ERROR(machine, RemoveAllCPUIDLeaves()); break; } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp (revision 27536) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/vm/VBoxVMSettingsSystem.cpp (revision 27537) @@ -186,5 +186,5 @@ .GetProcessorFeature (KProcessorFeature_PAE); mCbPae->setEnabled (fPAESupported); - mCbPae->setChecked (aMachine.GetCpuProperty(KCpuPropertyType_PAE)); + mCbPae->setChecked (aMachine.GetCPUProperty(KCPUPropertyType_PAE)); /* VT-x/AMD-V */ @@ -246,5 +246,5 @@ /* PAE/NX */ - mMachine.SetCpuProperty(KCpuPropertyType_PAE, mCbPae->isChecked()); + mMachine.SetCPUProperty(KCPUPropertyType_PAE, mCbPae->isChecked()); /* VT-x/AMD-V */ Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (revision 27536) +++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (revision 27537) @@ -682,5 +682,5 @@ // Turn on PAE, if recommended - m_Machine.SetCpuProperty(KCpuPropertyType_PAE, type.GetRecommendedPae()); + m_Machine.SetCPUProperty(KCPUPropertyType_PAE, type.GetRecommendedPae()); // Set recommended firmware type @@ -692,5 +692,5 @@ { m_Machine.SetKeyboardHidType(KKeyboardHidType_USBKeyboard); - m_Machine.SetPointingHidType(type.GetRecommendedUsbTablet() ? + m_Machine.SetPointingHidType(type.GetRecommendedUsbTablet() ? KPointingHidType_USBTablet : KPointingHidType_USBMouse); if (!usbController.isNull()) Index: /trunk/src/VBox/Main/ConsoleImpl2.cpp =================================================================== --- /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 27536) +++ /trunk/src/VBox/Main/ConsoleImpl2.cpp (revision 27537) @@ -330,5 +330,5 @@ ComPtr guestOSType; hrc = virtualBox->GetGuestOSType(osTypeId, guestOSType.asOutParam()); H(); - + Bstr guestTypeFamilyId; hrc = guestOSType->COMGETTER(FamilyId)(guestTypeFamilyId.asOutParam()); H(); @@ -370,5 +370,5 @@ { ULONG ulEax, ulEbx, ulEcx, ulEdx; - hrc = pMachine->GetCpuIdLeaf(uLeaf, &ulEax, &ulEbx, &ulEcx, &ulEdx); + hrc = pMachine->GetCPUIDLeaf(uLeaf, &ulEax, &ulEbx, &ulEcx, &ulEdx); if (SUCCEEDED(hrc)) { @@ -497,10 +497,10 @@ /* Physical Address Extension (PAE) */ BOOL fEnablePAE = false; - hrc = pMachine->GetCpuProperty(CpuPropertyType_PAE, &fEnablePAE); H(); + hrc = pMachine->GetCPUProperty(CPUPropertyType_PAE, &fEnablePAE); H(); rc = CFGMR3InsertInteger(pRoot, "EnablePAE", fEnablePAE); RC_CHECK(); /* Synthetic CPU */ BOOL fSyntheticCpu = false; - hrc = pMachine->GetCpuProperty(CpuPropertyType_Synthetic, &fSyntheticCpu); H(); + hrc = pMachine->GetCPUProperty(CPUPropertyType_Synthetic, &fSyntheticCpu); H(); rc = CFGMR3InsertInteger(pRoot, "SyntheticCpu", fSyntheticCpu); RC_CHECK(); Index: /trunk/src/VBox/Main/HostImpl.cpp =================================================================== --- /trunk/src/VBox/Main/HostImpl.cpp (revision 27536) +++ /trunk/src/VBox/Main/HostImpl.cpp (revision 27537) @@ -940,5 +940,5 @@ * @param aValEDX Where to return EDX. */ -STDMETHODIMP Host::GetProcessorCpuIdLeaf(ULONG aCpuId, ULONG aLeaf, ULONG aSubLeaf, +STDMETHODIMP Host::GetProcessorCPUIDLeaf(ULONG aCpuId, ULONG aLeaf, ULONG aSubLeaf, ULONG *aValEAX, ULONG *aValEBX, ULONG *aValECX, ULONG *aValEDX) { Index: /trunk/src/VBox/Main/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/MachineImpl.cpp (revision 27536) +++ /trunk/src/VBox/Main/MachineImpl.cpp (revision 27537) @@ -1423,5 +1423,5 @@ } -STDMETHODIMP Machine::GetCpuProperty(CpuPropertyType_T property, BOOL *aVal) +STDMETHODIMP Machine::GetCPUProperty(CPUPropertyType_T property, BOOL *aVal) { if (!aVal) @@ -1435,9 +1435,9 @@ switch(property) { - case CpuPropertyType_PAE: + case CPUPropertyType_PAE: *aVal = mHWData->mPAEEnabled; break; - case CpuPropertyType_Synthetic: + case CPUPropertyType_Synthetic: *aVal = mHWData->mSyntheticCpu; break; @@ -1449,5 +1449,5 @@ } -STDMETHODIMP Machine::SetCpuProperty(CpuPropertyType_T property, BOOL aVal) +STDMETHODIMP Machine::SetCPUProperty(CPUPropertyType_T property, BOOL aVal) { AutoCaller autoCaller(this); @@ -1461,5 +1461,5 @@ switch(property) { - case CpuPropertyType_PAE: + case CPUPropertyType_PAE: setModified(IsModified_MachineData); mHWData.backup(); @@ -1467,5 +1467,5 @@ break; - case CpuPropertyType_Synthetic: + case CPUPropertyType_Synthetic: setModified(IsModified_MachineData); mHWData.backup(); @@ -1479,5 +1479,5 @@ } -STDMETHODIMP Machine::GetCpuIdLeaf(ULONG aId, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx) +STDMETHODIMP Machine::GetCPUIDLeaf(ULONG aId, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx) { CheckComArgOutPointerValid(aValEax); @@ -1539,5 +1539,5 @@ } -STDMETHODIMP Machine::SetCpuIdLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx) +STDMETHODIMP Machine::SetCPUIDLeaf(ULONG aId, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx) { AutoCaller autoCaller(this); @@ -1601,5 +1601,5 @@ } -STDMETHODIMP Machine::RemoveCpuIdLeaf(ULONG aId) +STDMETHODIMP Machine::RemoveCPUIDLeaf(ULONG aId) { AutoCaller autoCaller(this); @@ -1657,5 +1657,5 @@ } -STDMETHODIMP Machine::RemoveAllCpuIdLeafs() +STDMETHODIMP Machine::RemoveAllCPUIDLeaves() { AutoCaller autoCaller(this); Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 27536) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 27537) @@ -807,10 +807,10 @@ Virtual CPU property type. This enumeration represents possible values of the - IMachine get- and setCpuProperty methods. + IMachine get- and setCPUProperty methods. @@ -4267,5 +4267,5 @@ @@ -5371,5 +5371,5 @@ - + Returns the virtual CPU boolean value of the specified property. @@ -5380,5 +5380,5 @@ - + Property type to query. @@ -5392,5 +5392,5 @@ - + Sets the virtual CPU boolean value of the specified property. @@ -5401,5 +5401,5 @@ - + Property type to query. @@ -5413,5 +5413,5 @@ - + Returns the virtual CPU cpuid information for the specified leaf. @@ -5430,30 +5430,30 @@ - Cpuid leaf index. + CPUID leaf index. - Cpuid leaf value for register eax. + CPUID leaf value for register eax. - Cpuid leaf value for register ebx. + CPUID leaf value for register ebx. - Cpuid leaf value for register ecx. + CPUID leaf value for register ecx. - Cpuid leaf value for register edx. - - - - - + CPUID leaf value for register edx. + + + + + Sets the virtual CPU cpuid information for the specified leaf. Note that these values @@ -5476,30 +5476,30 @@ - Cpuid leaf index. + CPUID leaf index. - Cpuid leaf value for register eax. + CPUID leaf value for register eax. - Cpuid leaf value for register ebx. + CPUID leaf value for register ebx. - Cpuid leaf value for register ecx. + CPUID leaf value for register ecx. - Cpuid leaf value for register edx. - - - - - + CPUID leaf value for register edx. + + + + + Removes the virtual CPU cpuid leaf for the specified index @@ -5512,12 +5512,12 @@ - Cpuid leaf index. - - - - - - - Removes all the virtual CPU cpuid leafs + CPUID leaf index. + + + + + + + Removes all the virtual CPU cpuid leaves @@ -6092,5 +6092,5 @@ - + Plugs a CPU into the machine. @@ -6103,5 +6103,5 @@ - + Removes a CPU from the machine. @@ -6114,5 +6114,5 @@ - + Plugs a CPU into the machine. @@ -7684,5 +7684,5 @@ - + Returns the CPU cpuid information for the specified leaf. @@ -7699,32 +7699,32 @@ - Cpuid leaf index (eax). + CPUID leaf index (eax). - Cpuid leaf sub index (ecx). This currently only applies to cache + CPUID leaf sub index (ecx). This currently only applies to cache information on Intel CPUs. Use 0 if retriving values for - . + . - Cpuid leaf value for register eax. + CPUID leaf value for register eax. - Cpuid leaf value for register ebx. + CPUID leaf value for register ebx. - Cpuid leaf value for register ecx. + CPUID leaf value for register ecx. - Cpuid leaf value for register edx. + CPUID leaf value for register edx. @@ -13372,5 +13372,5 @@ @@ -13455,5 +13455,5 @@ - + Gets the corresponding port number which is emulated as an IDE device. @@ -13472,5 +13472,5 @@ - + Sets the port number which is emulated as an IDE device. Index: /trunk/src/VBox/Main/include/HostImpl.h =================================================================== --- /trunk/src/VBox/Main/include/HostImpl.h (revision 27536) +++ /trunk/src/VBox/Main/include/HostImpl.h (revision 27537) @@ -74,5 +74,5 @@ STDMETHOD(GetProcessorDescription)(ULONG cpuId, BSTR *description); STDMETHOD(GetProcessorFeature) (ProcessorFeature_T feature, BOOL *supported); - STDMETHOD(GetProcessorCpuIdLeaf)(ULONG aCpuId, ULONG aLeaf, ULONG aSubLeaf, ULONG *aValEAX, ULONG *aValEBX, ULONG *aValECX, ULONG *aValEDX); + STDMETHOD(GetProcessorCPUIDLeaf)(ULONG aCpuId, ULONG aLeaf, ULONG aSubLeaf, ULONG *aValEAX, ULONG *aValEBX, ULONG *aValECX, ULONG *aValEDX); STDMETHOD(COMGETTER(MemorySize))(ULONG *size); STDMETHOD(COMGETTER(MemoryAvailable))(ULONG *available); Index: /trunk/src/VBox/Main/include/MachineImpl.h =================================================================== --- /trunk/src/VBox/Main/include/MachineImpl.h (revision 27536) +++ /trunk/src/VBox/Main/include/MachineImpl.h (revision 27537) @@ -467,10 +467,10 @@ STDMETHOD(GetExtraData)(IN_BSTR aKey, BSTR *aValue); STDMETHOD(SetExtraData)(IN_BSTR aKey, IN_BSTR aValue); - STDMETHOD(GetCpuProperty)(CpuPropertyType_T property, BOOL *aVal); - STDMETHOD(SetCpuProperty)(CpuPropertyType_T property, BOOL aVal); - STDMETHOD(GetCpuIdLeaf)(ULONG id, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx); - STDMETHOD(SetCpuIdLeaf)(ULONG id, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx); - STDMETHOD(RemoveCpuIdLeaf)(ULONG id); - STDMETHOD(RemoveAllCpuIdLeafs)(); + STDMETHOD(GetCPUProperty)(CPUPropertyType_T property, BOOL *aVal); + STDMETHOD(SetCPUProperty)(CPUPropertyType_T property, BOOL aVal); + STDMETHOD(GetCPUIDLeaf)(ULONG id, ULONG *aValEax, ULONG *aValEbx, ULONG *aValEcx, ULONG *aValEdx); + STDMETHOD(SetCPUIDLeaf)(ULONG id, ULONG aValEax, ULONG aValEbx, ULONG aValEcx, ULONG aValEdx); + STDMETHOD(RemoveCPUIDLeaf)(ULONG id); + STDMETHOD(RemoveAllCPUIDLeaves)(); STDMETHOD(GetHWVirtExProperty)(HWVirtExPropertyType_T property, BOOL *aVal); STDMETHOD(SetHWVirtExProperty)(HWVirtExPropertyType_T property, BOOL aVal);