Index: /trunk/include/VBox/vmm/pdmifs.h
===================================================================
--- /trunk/include/VBox/vmm/pdmifs.h (revision 65119)
+++ /trunk/include/VBox/vmm/pdmifs.h (revision 65120)
@@ -381,5 +381,5 @@
* @param fRelative Whether relative mode is currently supported.
* @param fAbsolute Whether absolute mode is currently supported.
- * @param fAbsolute Whether multi-touch mode is currently supported.
+ * @param fMultiTouch Whether multi-touch mode is currently supported.
*/
DECLR3CALLBACKMEMBER(void, pfnReportModes,(PPDMIMOUSECONNECTOR pInterface, bool fRelative, bool fAbsolute, bool fMultiTouch));
Index: /trunk/src/VBox/Main/include/Global.h
===================================================================
--- /trunk/src/VBox/Main/include/Global.h (revision 65119)
+++ /trunk/src/VBox/Main/include/Global.h (revision 65120)
@@ -122,5 +122,5 @@
/**
* Shortcut to IsOnline(aState) || IsTransient(aState). When it returns
- * @false, the VM is turned off (no VM process) and not busy with
+ * @c false, the VM is turned off (no VM process) and not busy with
* another exclusive operation.
*/
Index: /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h (revision 65119)
+++ /trunk/src/VBox/Main/include/HostNetworkInterfaceImpl.h (revision 65120)
@@ -40,5 +40,5 @@
// public initializer/uninitializer for internal purposes only
- HRESULT init(Bstr interfaceName, Bstr shortName, Guid guid, HostNetworkInterfaceType_T ifType);
+ HRESULT init(Bstr aInterfaceName, Bstr aShortName, Guid aGuid, HostNetworkInterfaceType_T ifType);
#ifdef VBOX_WITH_HOSTNETIF_API
HRESULT init(Bstr aInterfaceName, HostNetworkInterfaceType_T ifType, struct NETIFINFO *pIfs);
Index: /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (revision 65120)
@@ -2615,5 +2615,4 @@
* fail.
* @param a_pstrDisplayInfo Host specific display information hacks.
- * @param a_ppProgress Where to return a progress object some day. Can
* be NULL.
*/
@@ -3043,5 +3042,5 @@
* @param a_pszModuleName The library.
* @param a_pszExtPack The extension pack.
- * @param a_pstrVrdeLibrary Where to return the path.
+ * @param a_pstrLibrary Where to return the path.
*/
HRESULT ExtPackManager::i_getLibraryPathForExtPack(const char *a_pszModuleName, const char *a_pszExtPack, Utf8Str *a_pstrLibrary)
Index: /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-all/VirtualBoxBase.cpp (revision 65120)
@@ -215,6 +215,6 @@
* @endcode
*
- * @param aThis object where the exception happened
- * @param RT_SRC_POS_DECL "RT_SRC_POS" macro instantiation.
+ * @param aThis object where the exception happened
+ * @param SRC_POS "RT_SRC_POS" macro instantiation.
* */
/* static */
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 65120)
@@ -1568,5 +1568,6 @@
* called when the user saves the VM state.
*
- * @param pvUser pointer to Console
+ * @param pSSM SSM handle.
+ * @param pvUser pointer to Console
*
* @note Locks the Console object for reading.
@@ -1622,4 +1623,5 @@
* Called when the VM is being restored from the saved state.
*
+ * @param pSSM SSM handle.
* @param pvUser pointer to Console
* @param uVersion Console unit version.
@@ -1648,7 +1650,7 @@
/**
* Method to load various console data from the state file.
- * Called from #loadDataFromSavedState.
- *
- * @param pvUser pointer to Console
+ * Called from #i_loadDataFromSavedState.
+ *
+ * @param pSSM SSM handle.
* @param u32Version Console unit version.
* Should match sSSMConsoleVer.
@@ -3320,5 +3322,5 @@
* @param pAlock The automatic lock instance. This is for when we have
* to leave it in order to avoid deadlocks.
- * @param pfSuspend where to store the information if we need to resume
+ * @param pfResume where to store the information if we need to resume
* afterwards.
*/
@@ -3516,12 +3518,8 @@
* @param pcszDevice The PDM device name.
* @param uInstance The PDM device instance.
- * @param uLun The PDM LUN number of the drive.
- * @param fHostDrive True if this is a host drive attachment.
- * @param pszPath The path to the media / drive which is now being mounted / captured.
- * If NULL no media or drive is attached and the LUN will be configured with
- * the default block driver with no media. This will also be the state if
- * mounting / capturing the specified media / drive fails.
- * @param pszFormat Medium format string, usually "RAW".
- * @param fPassthrough Enables using passthrough mode of the host DVD drive if applicable.
+ * @param enmBus The storage bus type of the controller.
+ * @param fUseHostIOCache Whether to use the host I/O cache (disable async I/O).
+ * @param aMediumAtt The medium attachment.
+ * @param fForce Force unmounting.
*
* @thread EMT
@@ -3698,4 +3696,7 @@
* @param pcszDevice The PDM device name.
* @param uInstance The PDM device instance.
+ * @param enmBus The storage bus type of the controller.
+ * @param fUseHostIOCache Whether to use the host I/O cache (disable async I/O).
+ * @param aMediumAtt The medium attachment.
* @param fSilent Flag whether to inform the guest about the attached device.
*
@@ -3868,4 +3869,6 @@
* @param pcszDevice The PDM device name.
* @param uInstance The PDM device instance.
+ * @param enmBus The storage bus type of the controller.
+ * @param pMediumAtt Pointer to the medium attachment.
* @param fSilent Flag whether to notify the guest about the detached device.
*
@@ -4427,5 +4430,5 @@
*
* @returns COM status code.
- * @param aId The ID to look for.
+ * @param strId The ID to look for.
*/
HRESULT Console::i_clearDiskEncryptionKeysOnAllAttachmentsWithKeyId(const Utf8Str &strId)
@@ -4688,6 +4691,7 @@
* Parses the encryption configuration for one disk.
*
- * @returns Pointer to the string following encryption configuration.
- * @param psz Pointer to the configuration for the encryption of one disk.
+ * @returns COM status code.
+ * @param psz Pointer to the configuration for the encryption of one disk.
+ * @param ppszEnd Pointer to the string following encrpytion configuration.
*/
HRESULT Console::i_consoleParseDiskEncryption(const char *psz, const char **ppszEnd)
@@ -5449,8 +5453,8 @@
* @return failure if not attached.
*
- * @param aDevice
- * The device in question.
- * @param aMaskedIfs
- * The interfaces to hide from the guest.
+ * @param aDevice The device in question.
+ * @param aError Error information.
+ * @param aMaskedIfs The interfaces to hide from the guest.
+ * @param aCaptureFilename File name where to store the USB traffic.
*
* @note Locks this object for writing.
@@ -7870,5 +7874,5 @@
* in the collection of shared folders.
*
- * @param aName logical name of the shared folder
+ * @param strName logical name of the shared folder
* @param aSharedFolder where to return the found object
* @param aSetError whether to set the error info if the folder is
@@ -8047,5 +8051,5 @@
* shared folders and then in the list of the global shared folders.
*
- * @param aName Name of the folder to search for.
+ * @param strName Name of the folder to search for.
* @param aIt Where to store the pointer to the found folder.
* @return @c true if the folder was found and @c false otherwise.
@@ -8075,6 +8079,6 @@
* Calls the HGCM service to add a shared folder definition.
*
- * @param aName Shared folder name.
- * @param aHostPath Shared folder path.
+ * @param strName Shared folder name.
+ * @param aData Shared folder data.
*
* @note Must be called from under AutoVMCaller and when mpUVM != NULL!
@@ -8188,5 +8192,5 @@
* Calls the HGCM service to remove the shared folder definition.
*
- * @param aName Shared folder name.
+ * @param strName Shared folder name.
*
* @note Must be called from under AutoVMCaller and when mpUVM != NULL!
@@ -9220,5 +9224,5 @@
/*static*/ DECLCALLBACK(void)
Console::i_genericVMSetErrorCallback(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL,
- const char *pszErrorFmt, va_list va)
+ const char *pszFormat, va_list args)
{
RT_SRC_POS_NOREF();
@@ -9228,12 +9232,12 @@
/* We ignore RT_SRC_POS_DECL arguments to avoid confusion of end-users. */
va_list va2;
- va_copy(va2, va);
+ va_copy(va2, args);
/* Append to any the existing error message. */
if (pErrorText->length())
*pErrorText = Utf8StrFmt("%s.\n%N (%Rrc)", pErrorText->c_str(),
- pszErrorFmt, &va2, rc, rc);
+ pszFormat, &va2, rc, rc);
else
- *pErrorText = Utf8StrFmt("%N (%Rrc)", pszErrorFmt, &va2, rc, rc);
+ *pErrorText = Utf8StrFmt("%N (%Rrc)", pszFormat, &va2, rc, rc);
va_end(va2);
@@ -9952,7 +9956,9 @@
* @param pThis Reference to the console object.
* @param pUVM The VM handle.
- * @param lInstance The instance of the controller.
* @param pcszDevice The name of the controller type.
+ * @param uInstance The instance of the controller.
* @param enmBus The storage bus type of the controller.
+ * @param fUseHostIOCache Use the host I/O cache (disable async I/O).
+ * @param fBuiltinIOCache Use the builtin I/O cache.
* @param fSetupMerge Whether to set up a medium merge
* @param uMergeSource Merge source image index
Index: /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (revision 65120)
@@ -4013,7 +4013,8 @@
* @param enmBus The storage bus.
* @param enmDevType The device type.
- * @param pczsDevice The device emulation.
+ * @param pcszDevice The device emulation.
* @param uInstance Instance of the device.
* @param uLUN The LUN on the device.
+ * @param fForceUnmount Whether to force unmounting.
*/
int Console::i_unmountMediumFromGuest(PUVM pUVM, StorageBus_T enmBus, DeviceType_T enmDevType,
@@ -4061,5 +4062,5 @@
* @returns VBox status code.
* @param pCtlInst The controler instance node in the CFGM tree.
- * @param pczsDevice The device name.
+ * @param pcszDevice The device name.
* @param uInstance The device instance.
* @param uLUN The device LUN.
Index: /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp (revision 65120)
@@ -189,5 +189,5 @@
{
char *pszStart = pszBuf;
- RTSOCKET Sock = pState->mhSocket;
+ RTSOCKET hSocket = pState->mhSocket;
AssertReturn(cchBuf > 1, VERR_INTERNAL_ERROR);
@@ -198,5 +198,5 @@
{
char ch;
- int rc = RTTcpRead(Sock, &ch, sizeof(ch), NULL);
+ int rc = RTTcpRead(hSocket, &ch, sizeof(ch), NULL);
if (RT_FAILURE(rc))
{
@@ -932,5 +932,5 @@
*
* @param aHostname The name of the target host.
- * @param aPort The TCP port number.
+ * @param aTcpport The TCP port number.
* @param aPassword The password.
* @param aMaxDowntime Max allowed "downtime" in milliseconds.
@@ -1257,8 +1257,8 @@
*/
/*static*/ DECLCALLBACK(int)
-Console::i_teleporterTrgServeConnection(RTSOCKET Sock, void *pvUser)
+Console::i_teleporterTrgServeConnection(RTSOCKET hSocket, void *pvUser)
{
TeleporterStateTrg *pState = (TeleporterStateTrg *)pvUser;
- pState->mhSocket = Sock;
+ pState->mhSocket = hSocket;
/*
@@ -1267,5 +1267,5 @@
int vrc = RTTcpSetSendCoalescing(pState->mhSocket, false /*fEnable*/);
AssertRC(vrc);
- vrc = RTTcpWrite(Sock, g_szWelcome, sizeof(g_szWelcome) - 1);
+ vrc = RTTcpWrite(hSocket, g_szWelcome, sizeof(g_szWelcome) - 1);
if (RT_FAILURE(vrc))
{
@@ -1282,5 +1282,5 @@
{
char ch;
- vrc = RTTcpRead(Sock, &ch, sizeof(ch), NULL);
+ vrc = RTTcpRead(hSocket, &ch, sizeof(ch), NULL);
if ( RT_FAILURE(vrc)
|| pszPassword[off] != ch)
@@ -1304,5 +1304,5 @@
HRESULT hrc;
RTNETADDR Addr;
- vrc = RTTcpGetPeerAddress(Sock, &Addr);
+ vrc = RTTcpGetPeerAddress(hSocket, &Addr);
if (RT_SUCCESS(vrc))
{
Index: /trunk/src/VBox/Main/src-client/DisplayImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/DisplayImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/DisplayImpl.cpp (revision 65120)
@@ -607,6 +607,5 @@
*
* @returns COM result indicator
- * @param parent handle of our parent object
- * @param qemuConsoleData address of common console data structure
+ * @param aParent handle of our parent object
*/
HRESULT Display::init(Console *aParent)
@@ -891,8 +890,13 @@
* Handles display resize event.
*
- * @param w New display width
- * @param h New display height
+ * @param uScreenId Screen ID
+ * @param bpp New bits per pixel.
+ * @param pvVRAM VRAM pointer.
+ * @param cbLine New bytes per line.
+ * @param w New display width.
+ * @param h New display height.
+ * @param flags Flags of the new video mode.
*
- * @thread EMT
+ * @thread EMT
*/
int Display::i_handleDisplayResize(unsigned uScreenId, uint32_t bpp, void *pvVRAM,
Index: /trunk/src/VBox/Main/src-client/GuestImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/GuestImpl.cpp (revision 65120)
@@ -742,7 +742,8 @@
* Returns the status of a specified Guest Additions facility.
*
- * @return aStatus Current status of specified facility.
- * @param aType Facility to get the status from.
+ * @return COM status code
+ * @param aFacility Facility to get the status from.
* @param aTimestamp Timestamp of last facility status update in ms (optional).
+ * @param aStatus Current status of the specified facility.
*/
HRESULT Guest::getFacilityStatus(AdditionsFacilityType_T aFacility, LONG64 *aTimestamp, AdditionsFacilityStatus_T *aStatus)
@@ -1047,5 +1048,4 @@
* Gets called by vmmdevUpdateGuestStatus, which just passes the report along.
*
- * @param a_pInterface Pointer to this interface.
* @param a_enmFacility The facility.
* @param a_enmStatus The status.
@@ -1092,5 +1092,5 @@
* Sets the supported features (and whether they are active or not).
*
- * @param fCaps Guest capability bit mask (VMMDEV_GUEST_SUPPORTS_XXX).
+ * @param aCaps Guest capability bit mask (VMMDEV_GUEST_SUPPORTS_XXX).
*/
void Guest::i_setSupportedFeatures(uint32_t aCaps)
Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 65120)
@@ -2470,7 +2470,7 @@
* Converts a toolbox tool's exit code to an IPRT error code.
*
- * @return int Returned IPRT error for the particular tool.
- * @param pszTool Name of toolbox tool to lookup error code for.
- * @param rcExit The toolbox tool's exit code to lookup IPRT error for.
+ * @return Returned IPRT error for the particular tool.
+ * @param pszTool Name of toolbox tool to lookup error code for.
+ * @param lExitCode The toolbox tool's exit code to lookup IPRT error for.
*/
/* static */
Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 65120)
@@ -1952,5 +1952,5 @@
procInfo.mTimeoutMS = UINT32_MAX;
- /** @tood Implement process priority + affinity. */
+ /** @todo Implement process priority + affinity. */
AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
Index: /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/KeyboardImpl.cpp (revision 65120)
@@ -96,5 +96,5 @@
*
* @returns COM result indicator
- * @param parent handle of our parent object
+ * @param aParent handle of our parent object
*/
HRESULT Keyboard::init(Console *aParent)
Index: /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-client/MachineDebuggerImpl.cpp (revision 65120)
@@ -124,5 +124,5 @@
*
* @returns COM status code
- * @param a_fEnabled Where to store the result.
+ * @param aSingleStep Where to store the result.
*/
HRESULT MachineDebugger::getSingleStep(BOOL *aSingleStep)
@@ -533,5 +533,5 @@
*
* @returns COM status code
- * @param aEnabled address of result variable
+ * @param aHWVirtExEnabled address of result variable
*/
HRESULT MachineDebugger::getHWVirtExEnabled(BOOL *aHWVirtExEnabled)
@@ -553,5 +553,5 @@
*
* @returns COM status code
- * @param aEnabled address of result variable
+ * @param aHWVirtExNestedPagingEnabled address of result variable
*/
HRESULT MachineDebugger::getHWVirtExNestedPagingEnabled(BOOL *aHWVirtExNestedPagingEnabled)
@@ -573,5 +573,5 @@
*
* @returns COM status code
- * @param aEnabled address of result variable
+ * @param aHWVirtExVPIDEnabled address of result variable
*/
HRESULT MachineDebugger::getHWVirtExVPIDEnabled(BOOL *aHWVirtExVPIDEnabled)
Index: /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (revision 65120)
@@ -53,5 +53,7 @@
/**
* Public method implementation.
-* @param appliance
+* @param aAppliance Appliance object.
+* @param aLocation Where to store the appliance.
+* @param aDescription Appliance description.
* @return
*/
@@ -618,8 +620,8 @@
/**
* Public method implementation.
- * @param format
- * @param options
- * @param path
- * @param aProgress
+ * @param aFormat Appliance format.
+ * @param aOptions Export options.
+ * @param aPath Path to write the appliance to.
+ * @param aProgress Progress object.
* @return
*/
Index: /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (revision 65120)
@@ -68,5 +68,6 @@
* Thread implementation is in Appliance::readImpl().
*
- * @param aFile
+ * @param aFile File to read the appliance from.
+ * @param aProgress Progress object.
* @return
*/
@@ -752,5 +753,6 @@
* VirtualSystemScription instances created by Appliance::Interpret().
* Thread implementation is in Appliance::i_importImpl().
- * @param aProgress
+ * @param aOptions Import options.
+ * @param aProgress Progress object.
* @return
*/
Index: /trunk/src/VBox/Main/src-server/BandwidthGroupImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/BandwidthGroupImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/BandwidthGroupImpl.cpp (revision 65120)
@@ -90,18 +90,20 @@
/**
- * Initializes the object given another object
- * (a kind of copy constructor). This object shares data with
- * the object passed as an argument.
- *
- * @param aReshare
- * When false, the original object will remain a data owner.
- * Otherwise, data ownership will be transferred from the original
- * object to this one.
- *
- * @note This object must be destroyed before the original object
- * it shares data with is destroyed.
- *
- * @note Locks @a aThat object for writing if @a aReshare is @c true, or for
- * reading if @a aReshare is false.
+ * Initializes the object given another object
+ * (a kind of copy constructor). This object shares data with
+ * the object passed as an argument.
+ *
+ * @param aParent Pointer to our parent object.
+ * @param aThat
+ * @param aReshare
+ * When false, the original object will remain a data owner.
+ * Otherwise, data ownership will be transferred from the original
+ * object to this one.
+ *
+ * @note This object must be destroyed before the original object
+ * it shares data with is destroyed.
+ *
+ * @note Locks @a aThat object for writing if @a aReshare is @c true, or for
+ * reading if @a aReshare is false.
*/
HRESULT BandwidthGroup::init(BandwidthControl *aParent,
Index: /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp (revision 65120)
@@ -65,43 +65,17 @@
*
* @returns COM result indicator
- * @param aFamilyId os family short name string
- * @param aFamilyDescription os family name string
- * @param aId os short name string
- * @param aDescription os name string
- * @param aOSType global OS type ID
- * @param aOSHint os configuration hint
- * @param aRAMSize recommended RAM size in megabytes
- * @param aVRAMSize recommended video memory size in megabytes
- * @param aHDDSize recommended HDD size in bytes
+ * @param ostype containing the following parts:
+ * @a aFamilyId os family short name string
+ * @a aFamilyDescription os family name string
+ * @a aId os short name string
+ * @a aDescription os name string
+ * @a aOSType global OS type ID
+ * @a aOSHint os configuration hint
+ * @a aRAMSize recommended RAM size in megabytes
+ * @a aVRAMSize recommended video memory size in megabytes
+ * @a aHDDSize recommended HDD size in bytes
*/
-HRESULT GuestOSType::init(const Global::OSType &ostype)/*const char *aFamilyId, const char *aFamilyDescription,
- const char *aId, const char *aDescription,
- VBOXOSTYPE aOSType, uint32_t aOSHint,
- uint32_t aRAMSize, uint32_t aVRAMSize, uint64_t aHDDSize,
- NetworkAdapterType_T aNetworkAdapterType,
- uint32_t aNumSerialEnabled,
- StorageControllerType_T aDVDStorageControllerType,
- StorageBus_T aDVDStorageBusType,
- StorageControllerType_T aHDStorageControllerType,
- StorageBus_T aHDStorageBusType,
- ChipsetType_T aChipsetType
- AudioControllerType_T aAudioControllerType*/
-{
-#if 0
- LogFlowThisFunc(("aFamilyId='%s', aFamilyDescription='%s', "
- "aId='%s', aDescription='%s', "
- "aType=%d, aOSHint=%x, "
- "aRAMSize=%d, aVRAMSize=%d, aHDDSize=%lld, "
- "aNetworkAdapterType=%d, aNumSerialEnabled=%d, "
- "aStorageControllerType=%d\n",
- aFamilyId, aFamilyDescription,
- aId, aDescription,
- aOSType, aOSHint,
- aRAMSize, aVRAMSize, aHDDSize,
- aNetworkAdapterType,
- aNumSerialEnabled,
- aStorageControllerType));
-#endif
-
+HRESULT GuestOSType::init(const Global::OSType &ostype)
+{
ComAssertRet(ostype.familyId && ostype.familyDescription && ostype.id && ostype.description, E_INVALIDARG);
Index: /trunk/src/VBox/Main/src-server/HostImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/HostImpl.cpp (revision 65120)
@@ -537,5 +537,5 @@
*
* @returns COM status code
- * @param drives address of result pointer
+ * @param aDVDDrives address of result pointer
*/
@@ -561,5 +561,5 @@
*
* @returns COM status code
- * @param drives address of result pointer
+ * @param aFloppyDrives address of result pointer
*/
HRESULT Host::getFloppyDrives(std::vector > &aFloppyDrives)
@@ -628,5 +628,5 @@
*
* @returns COM status code
- * @param drives address of result pointer
+ * @param aNetworkInterfaces address of result pointer
*/
HRESULT Host::getNetworkInterfaces(std::vector > &aNetworkInterfaces)
@@ -900,5 +900,5 @@
*
* @returns COM status code
- * @param count address of result variable
+ * @param aCount address of result variable
*/
@@ -915,5 +915,5 @@
*
* @returns COM status code
- * @param count address of result variable
+ * @param aCount address of result variable
*/
HRESULT Host::getProcessorOnlineCount(ULONG *aCount)
@@ -929,5 +929,5 @@
*
* @returns COM status code
- * @param count address of result variable
+ * @param aCount address of result variable
*/
HRESULT Host::getProcessorCoreCount(ULONG *aCount)
@@ -943,5 +943,5 @@
*
* @returns COM status code
- * @param count address of result variable
+ * @param aCount address of result variable
*/
HRESULT Host::getProcessorOnlineCoreCount(ULONG *aCount)
@@ -957,6 +957,7 @@
*
* @returns COM status code
- * @param cpu id to get info for.
- * @param speed address of result variable, speed is 0 if unknown or aCpuId is invalid.
+ * @param aCpuId id to get info for.
+ * @param aSpeed address of result variable, speed is 0 if unknown or aCpuId
+ * is invalid.
*/
HRESULT Host::getProcessorSpeed(ULONG aCpuId,
@@ -973,6 +974,7 @@
*
* @returns COM status code
- * @param cpu id to get info for.
- * @param description address of result variable, empty string if not known or aCpuId is invalid.
+ * @param aCpuId id to get info for.
+ * @param aDescription address of result variable, empty string if not known
+ * or aCpuId is invalid.
*/
HRESULT Host::getProcessorDescription(ULONG aCpuId, com::Utf8Str &aDescription)
@@ -995,6 +997,6 @@
*
* @returns COM status code
- * @param Feature to query.
- * @param address of supported bool result variable
+ * @param aFeature to query.
+ * @param aSupported supported bool result variable
*/
HRESULT Host::getProcessorFeature(ProcessorFeature_T aFeature, BOOL *aSupported)
@@ -1118,5 +1120,5 @@
*
* @returns COM status code
- * @param size address of result variable
+ * @param aSize address of result variable
*/
HRESULT Host::getMemorySize(ULONG *aSize)
@@ -1136,5 +1138,5 @@
*
* @returns COM status code
- * @param available address of result variable
+ * @param aAvailable address of result variable
*/
HRESULT Host::getMemoryAvailable(ULONG *aAvailable)
@@ -1172,5 +1174,5 @@
*
* @returns COM status code
- * @param os address of result variable
+ * @param aVersion address of result variable
*/
HRESULT Host::getOSVersion(com::Utf8Str &aVersion)
@@ -1207,5 +1209,5 @@
*
* @returns COM status code
- * @param time address of result variable
+ * @param aUTCTime address of result variable
*/
HRESULT Host::getUTCTime(LONG64 *aUTCTime)
@@ -2049,5 +2051,5 @@
/**
* Called from getDrives() to build the DVD drives list.
- * @param pll
+ * @param list Media list
* @return
*/
Index: /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp (revision 65120)
@@ -65,6 +65,7 @@
* @returns COM result indicator
* @param aInterfaceName name of the network interface
- * @param aGuid GUID of the host network interface
- * @param ifType interface type
+ * @param aShortName short name of the network interface
+ * @param aGuid GUID of the host network interface
+ * @param ifType interface type
*/
HRESULT HostNetworkInterface::init(Bstr aInterfaceName, Bstr aShortName, Guid aGuid, HostNetworkInterfaceType_T ifType)
@@ -274,9 +275,9 @@
*
* @returns COM status code
- * @param aGuid GUI Id
- */
-HRESULT HostNetworkInterface::getId(com::Guid &aGuiId)
-{
- aGuiId = mGuid;
+ * @param aGuid GUID
+ */
+HRESULT HostNetworkInterface::getId(com::Guid &aGuid)
+{
+ aGuid = mGuid;
return S_OK;
Index: /trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp (revision 65120)
@@ -509,4 +509,5 @@
*
* @param aMachine Machine this device should be attach to.
+ * @param aCaptureFilename Filename to capture the USB traffic to.
* @param aMaskedIfs The interfaces to hide from the guest.
*/
@@ -2231,5 +2232,5 @@
* @param aNewState The new state (transitional).
- * @param aFinalSubState The final state of the transition (non-transitional).
+ * @param aFinalState The final state of the transition (non-transitional).
* @param aNewSubState The new sub-state when applicable.
*
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 65120)
@@ -286,4 +286,6 @@
* @param aId UUID for the new machine.
* @param fForceOverwrite Whether to overwrite an existing machine settings file.
+ * @param fDirectoryIncludesUUID Whether the use a special VM directory naming
+ * scheme (includes the UUID).
*
* @return Success indicator. if not S_OK, the machine object is invalid
@@ -407,5 +409,5 @@
*
* @param aParent Associated parent object
- * @param aConfigFile Local file system path to the VM settings file (can
+ * @param strConfigFile Local file system path to the VM settings file (can
* be relative to the VirtualBox config directory).
* @param aId UUID of the machine or NULL (see above).
@@ -518,4 +520,5 @@
* config is ignored and we always generate a fresh one.
*
+ * @param aParent Associated parent object.
* @param strName Name for the new machine; this overrides what is specified in config and is used
* for the settings file as well.
@@ -610,5 +613,6 @@
/**
* Shared code between the various init() implementations.
- * @param aParent
+ * @param aParent The VirtualBox object.
+ * @param strConfigFile Settings file.
* @return
*/
@@ -7255,5 +7259,6 @@
* Adds the given IsModified_* flag to the dirty flags of the machine.
* This must be called either during i_loadSettings or under the machine write lock.
- * @param fl
+ * @param fl Flag
+ * @param fAllowStateModification If state modifications are allowed.
*/
void Machine::i_setModified(uint32_t fl, bool fAllowStateModification /* = true */)
@@ -7268,5 +7273,6 @@
* care of the write locking.
*
- * @param fModifications The flag to add.
+ * @param fModification The flag to add.
+ * @param fAllowStateModification If state modifications are allowed.
*/
void Machine::i_setModifiedLock(uint32_t fModification, bool fAllowStateModification /* = true */)
@@ -7279,5 +7285,5 @@
* Saves the registry entry of this machine to the given configuration node.
*
- * @param aEntryNode Node to save the registry entry to.
+ * @param data Machine registry data.
*
* @note locks this object for reading.
@@ -7300,5 +7306,5 @@
* machine settings file as the current directory.
*
- * @param aPath Path to calculate the absolute path for.
+ * @param strPath Path to calculate the absolute path for.
* @param aResult Where to put the result (used only on success, can be the
* same Utf8Str instance as passed in @a aPath).
@@ -7453,5 +7459,5 @@
* So instead we now use a timestamp.
*
- * @param str
+ * @param strStateFilePath
*/
@@ -8891,7 +8897,9 @@
* Loads settings into mHWData.
*
- * @param data Reference to the hardware settings.
- * @param pDbg Pointer to the debugging settings.
- * @param pAutostart Pointer to the autostart settings.
+ * @param puuidRegistry Registry ID.
+ * @param puuidSnapshot Snapshot ID
+ * @param data Reference to the hardware settings.
+ * @param pDbg Pointer to the debugging settings.
+ * @param pAutostart Pointer to the autostart settings.
*/
HRESULT Machine::i_loadHardware(const Guid *puuidRegistry,
@@ -9301,8 +9309,9 @@
* Called from i_loadStorageControllers for a controller's devices.
*
- * @param aStorageController
- * @param data
- * @param puuidRegistry media registry ID to set media to or NULL; see Machine::i_loadMachineDataFromSettings()
- * @param aSnapshotId pointer to the snapshot ID if this is a snapshot machine
+ * @param aStorageController
+ * @param data
+ * @param puuidRegistry media registry ID to set media to or NULL; see
+ * Machine::i_loadMachineDataFromSettings()
+ * @param puuidSnapshot pointer to the snapshot ID if this is a snapshot machine
* @return
*/
@@ -9572,5 +9581,5 @@
* Returns the snapshot with the given name or fails of no such snapshot.
*
- * @param aName snapshot name to find
+ * @param strName snapshot name to find
* @param aSnapshot where to return the found snapshot
* @param aSetError true to set extended error info on failure
@@ -9965,4 +9974,5 @@
* saved and the global machine and media registries will therefore need
* updating.
+ * @param aFlags Flags.
*/
HRESULT Machine::i_saveSettings(bool *pfNeedsGlobalSaveSettings,
@@ -10728,4 +10738,5 @@
* many operations left as the number of hard disks
* attached).
+ * @param aWeight Weight of this operation.
* @param aOnline Whether the VM was online prior to this operation.
*
@@ -11186,5 +11197,5 @@
* can be searched as well if needed.
*
- * @param list
+ * @param ll
* @param aControllerName
* @param aControllerPort
@@ -11212,8 +11223,6 @@
* can be searched as well if needed.
*
- * @param list
- * @param aControllerName
- * @param aControllerPort
- * @param aDevice
+ * @param ll
+ * @param pMedium
* @return
*/
@@ -11237,8 +11246,6 @@
* can be searched as well if needed.
*
- * @param list
- * @param aControllerName
- * @param aControllerPort
- * @param aDevice
+ * @param ll
+ * @param id
* @return
*/
@@ -11261,8 +11268,10 @@
* from Machine::prepareUnregister() so it has been taken out for simplicity.
*
- * @param pAttach Medium attachment to detach.
- * @param writeLock Machine write lock which the caller must have locked once. This may be released temporarily in here.
- * @param pSnapshot If NULL, then the detachment is for the current machine. Otherwise this is for a
- * SnapshotMachine, and this must be its snapshot.
+ * @param pAttach Medium attachment to detach.
+ * @param writeLock Machine write lock which the caller must have locked once.
+ * This may be released temporarily in here.
+ * @param pSnapshot If NULL, then the detachment is for the current machine.
+ * Otherwise this is for a SnapshotMachine, and this must be
+ * its snapshot.
* @return
*/
@@ -11337,10 +11346,13 @@
* will be passed on to i_detachDevice which needs it for temporary unlocking.
*
- * @param writeLock Machine lock from top-level caller; this gets passed to i_detachDevice.
- * @param pSnapshot Must be NULL when called for a "real" Machine or a snapshot object if called for a SnapshotMachine.
- * @param cleanupMode If DetachAllReturnHardDisksOnly, only hard disk media get added to llMedia; if
- * Full, then all media get added;
- * otherwise no media get added.
- * @param llMedia Caller's list to receive Medium objects which got detached so caller can close() them, depending on cleanupMode.
+ * @param writeLock Machine lock from top-level caller; this gets passed to
+ * i_detachDevice.
+ * @param pSnapshot Must be NULL when called for a "real" Machine or a snapshot
+ * object if called for a SnapshotMachine.
+ * @param cleanupMode If DetachAllReturnHardDisksOnly, only hard disk media get
+ * added to llMedia; if Full, then all media get added;
+ * otherwise no media get added.
+ * @param llMedia Caller's list to receive Medium objects which got detached so
+ * caller can close() them, depending on cleanupMode.
* @return
*/
Index: /trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/MediumAttachmentImpl.cpp (revision 65120)
@@ -96,11 +96,11 @@
* @param aDevice Device number on the port.
* @param aType Device type.
- * @param aImplicit
+ * @param aImplicit
* @param aPassthrough Whether accesses are directly passed to the host drive.
- * @param aTempEject
+ * @param aTempEject Whether guest-triggered eject results in unmounting the medium.
* @param aNonRotational Whether this medium is non-rotational (aka SSD).
- * @param aDiscard
+ * @param aDiscard Whether this medium supports discarding unused blocks.
* @param aHotPluggable Whether this medium is hot-pluggable.
- * @param aBandwidthLimit Bandwidth limit in Mbps.
+ * @param strBandwidthGroup Bandwidth group.
*/
HRESULT MediumAttachment::init(Machine *aParent,
Index: /trunk/src/VBox/Main/src-server/MediumImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 65120)
@@ -1441,7 +1441,10 @@
* @param aParent Parent medium disk or NULL for a root (base) medium.
* @param aDeviceType Device type of the medium.
- * @param uuidMachineRegistry The registry to which this medium should be added (global registry UUID or machine UUID).
+ * @param uuidMachineRegistry The registry to which this medium should be added
+ * (global registry UUID or machine UUID).
* @param data Configuration settings.
- * @param strMachineFolder The machine folder with which to resolve relative paths; if empty, then we use the VirtualBox home directory
+ * @param strMachineFolder The machine folder with which to resolve relative
+ * paths; if empty, then we use the VirtualBox home directory
+ * @param mediaTreeLock Autolock.
*
* @note Locks the medium tree for writing.
@@ -5441,5 +5444,5 @@
* necessary consistency checks and place involved media to appropriate
* states. If #mergeTo() is not called or fails, the state modifications
- * performed by this method must be undone by #cancelMergeTo().
+ * performed by this method must be undone by #i_cancelMergeTo().
*
* See #mergeTo() for more information about merging.
@@ -5451,5 +5454,5 @@
* @param fLockMedia Flag whether to lock the medium lock list or not.
* If set to false and the medium lock list locking fails
- * later you must call #cancelMergeTo().
+ * later you must call #i_cancelMergeTo().
* @param fMergeForward Resulting merge direction (out).
* @param pParentForTarget New parent for target medium after merge (out).
@@ -5791,6 +5794,6 @@
* any VM directly or in the snapshot, otherwise this method will assert.
*
- * The #prepareMergeTo() method must be called prior to this method to place all
- * involved to necessary states and perform other consistency checks.
+ * The #i_prepareMergeTo() method must be called prior to this method to place
+ * all involved to necessary states and perform other consistency checks.
*
* If @a aWait is @c true then this method will perform the operation on the
@@ -5815,5 +5818,5 @@
* When this method fails (regardless of the @a aWait mode), it is a caller's
* responsibility to undo state changes and delete @a aMediumLockList using
- * #cancelMergeTo().
+ * #i_cancelMergeTo().
*
* If @a aProgress is not NULL but the object it points to is @c null then a new
@@ -5923,5 +5926,5 @@
/**
- * Undoes what #prepareMergeTo() did. Must be called if #mergeTo() is not
+ * Undoes what #i_prepareMergeTo() did. Must be called if #mergeTo() is not
* called or fails. Frees memory occupied by @a aMediumLockList and unlocks
* the medium objects in @a aChildrenToReparent.
@@ -7530,5 +7533,5 @@
* @param pvUser The opaque data passed on container creation.
* @param rc The VBox error code.
- * @param RT_SRC_POS_DECL Use RT_SRC_POS.
+ * @param SRC_POS Use RT_SRC_POS.
* @param pszFormat Error message format string.
* @param va Error message arguments.
Index: /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp (revision 65120)
@@ -859,4 +859,5 @@
*
* @param aParent Handle of the parent object.
+ * @param data Settings data.
*/
HRESULT HostUSBDeviceFilter::init(Host *aParent,
@@ -929,4 +930,5 @@
*
* @param aParent Handle of the parent object.
+ * @param aName Filter name.
*/
HRESULT HostUSBDeviceFilter::init(Host *aParent, IN_BSTR aName)
@@ -1247,5 +1249,4 @@
* @param aIdx The field index.
* @param aStr The new value.
- * @param aName The translated field name (for error messages).
*
* @return COM status.
Index: /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp (revision 65119)
+++ /trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp (revision 65120)
@@ -893,6 +893,7 @@
virtual ~hotplugNullImpl (void) {}
/** @copydoc VBoxMainHotplugWaiter::Wait */
- virtual int Wait (RTMSINTERVAL)
- {
+ virtual int Wait (RTMSINTERVAL cMillies)
+ {
+ NOREF(cMillies);
return VERR_NOT_SUPPORTED;
}