Changeset 65088 in vbox for trunk/src/VBox/Main/src-server
- Timestamp:
- Jan 3, 2017 8:52:49 PM (8 years ago)
- svn:sync-xref-src-repo-rev:
- 112590
- Location:
- trunk/src/VBox/Main/src-server
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-server/ApplianceImpl.cpp
r63563 r65088 270 270 * Private helper func that suggests a VirtualBox guest OS type 271 271 * for the given OVF operating system type. 272 * @param osTypeVBox272 * @param strType 273 273 * @param c 274 274 * @param cStr … … 446 446 /** 447 447 * Public method implementation. 448 * @param 448 * @param aPath 449 449 * @return 450 450 */ … … 463 463 /** 464 464 * Public method implementation. 465 * @param 465 * @param aDisks 466 466 * @return 467 467 */ … … 531 531 /** 532 532 * Public method implementation. 533 * @param 533 * @param aVirtualSystemDescriptions 534 534 * @return 535 535 */ … … 553 553 /** 554 554 * Public method implementation. 555 * @param a Disks555 * @param aMachines 556 556 * @return 557 557 */ … … 1564 1564 * @param aType Type of description for the new item. 1565 1565 * @param strRef Reference item; only used with hard disk controllers. 1566 * @param aO rigValue Corresponding original value from OVF.1567 * @param a AutoValue Initial configuration value (can be overridden by caller with setFinalValues).1566 * @param aOvfValue Corresponding original value from OVF. 1567 * @param aVBoxValue Initial configuration value (can be overridden by caller with setFinalValues). 1568 1568 * @param ulSizeMB Weight for IProgress 1569 1569 * @param strExtraConfig Extra configuration; meaning dependent on type. -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r63563 r65088 892 892 * Opens a source file (for reading obviously). 893 893 * 894 * @param stack 894 895 * @param rstrSrcPath The source file to open. 895 896 * @param pszManifestEntry The manifest entry of the source file. This is … … 993 994 /** 994 995 * 996 * @param stack Import stack. 997 * @param rstrSrcPath Source path. 998 * @param rstrDstPath Destination path. 995 999 * @param pszManifestEntry The manifest entry of the source file. This is 996 1000 * used when constructing our manifest using a pass … … 1041 1045 /** 1042 1046 * 1047 * @param stack 1048 * @param rstrSrcPath 1049 * @param rstrDstPath 1043 1050 * @param pszManifestEntry The manifest entry of the source file. This is 1044 1051 * used when constructing our manifest using a pass … … 1988 1995 * 1) from the public Appliance::ImportMachines(). 1989 1996 * 1990 * @param aLocInfo1991 * @param aProgress1997 * @param locInfo 1998 * @param progress 1992 1999 * @return 1993 2000 */ … … 2364 2371 lControllerPort = (long)ulAddressOnParent; 2365 2372 lDevice = (long)0; 2366 break;2373 break; 2367 2374 2368 2375 case ovf::HardDiskController::SCSI: … … 2374 2381 lControllerPort = (long)ulAddressOnParent; 2375 2382 lDevice = (long)0; 2383 break; 2376 2384 } 2377 break;2378 2385 2379 2386 default: break; … … 3448 3455 * 4) Create the VirtualBox machine with the modfified machine config. 3449 3456 * 3450 * @param config3451 * @param pNewMachine3452 * @param stack3457 * @param vsdescThis 3458 * @param pReturnNewMachine 3459 * @param stack 3453 3460 */ 3454 3461 void Appliance::i_importVBoxMachine(ComObjPtr<VirtualSystemDescription> &vsdescThis, -
trunk/src/VBox/Main/src-server/HostDnsService.h
r62485 r65088 116 116 }; 117 117 118 # if def RT_OS_DARWIN118 # if defined(RT_OS_DARWIN) || defined(DOXYGEN_RUNNING) 119 119 class HostDnsServiceDarwin : public HostDnsMonitor 120 120 { … … 135 135 }; 136 136 # endif 137 # if def RT_OS_WINDOWS137 # if defined(RT_OS_WINDOWS) || defined(DOXYGEN_RUNNING) 138 138 class HostDnsServiceWin : public HostDnsMonitor 139 139 { … … 155 155 }; 156 156 # endif 157 # if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) 157 # if defined(RT_OS_SOLARIS) || defined(RT_OS_LINUX) || defined(RT_OS_OS2) || defined(RT_OS_FREEBSD) \ 158 || defined(DOXYGEN_RUNNING) 158 159 class HostDnsServiceResolvConf: public HostDnsMonitor 159 160 { … … 176 177 Data *m; 177 178 }; 178 # if defined(RT_OS_SOLARIS) 179 # if defined(RT_OS_SOLARIS) || defined(DOXYGEN_RUNNING) 179 180 /** 180 181 * XXX: https://blogs.oracle.com/praks/entry/file_events_notification … … 190 191 }; 191 192 192 # elif defined(RT_OS_LINUX) 193 # endif 194 # if defined(RT_OS_LINUX) || defined(DOXYGEN_RUNNING) 193 195 class HostDnsServiceLinux : public HostDnsServiceResolvConf 194 196 { … … 205 207 }; 206 208 207 # elif defined(RT_OS_FREEBSD) 209 # endif 210 # if defined(RT_OS_FREEBSD) || defined(DOXYGEN_RUNNING) 208 211 class HostDnsServiceFreebsd: public HostDnsServiceResolvConf 209 212 { … … 216 219 }; 217 220 218 # elif defined(RT_OS_OS2) 221 # endif 222 # if defined(RT_OS_OS2) || defined(DOXYGEN_RUNNING) 219 223 class HostDnsServiceOs2 : public HostDnsServiceResolvConf 220 224 { -
trunk/src/VBox/Main/src-server/HostImpl.cpp
r63563 r65088 1154 1154 * 1155 1155 * @returns COM status code 1156 * @param os address ofresult variable1156 * @param aOperatingSystem result variable 1157 1157 */ 1158 1158 HRESULT Host::getOperatingSystem(com::Utf8Str &aOperatingSystem) -
trunk/src/VBox/Main/src-server/HostNetworkInterfaceImpl.cpp
r62485 r65088 66 66 * @param aInterfaceName name of the network interface 67 67 * @param aGuid GUID of the host network interface 68 * @param ifType interface type 68 69 */ 69 70 HRESULT HostNetworkInterface::init(Bstr aInterfaceName, Bstr aShortName, Guid aGuid, HostNetworkInterfaceType_T ifType) … … 363 364 364 365 /** 365 * Returns the IP V6 network mask of the host network interface.366 * 367 * @returns COM status code 368 * @param aIPV6 Maskaddress of result pointer366 * Returns the IP V6 network mask prefix length of the host network interface. 367 * 368 * @returns COM status code 369 * @param aIPV6NetworkMaskPrefixLength address of result pointer 369 370 */ 370 371 HRESULT HostNetworkInterface::getIPV6NetworkMaskPrefixLength(ULONG *aIPV6NetworkMaskPrefixLength) -
trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
r65063 r65088 639 639 /** 640 640 * Internal implementation for Snapshot::updateSavedStatePaths (below). 641 * @param aOldPath642 * @param aNewPath641 * @param strOldPath 642 * @param strNewPath 643 643 */ 644 644 void Snapshot::i_updateSavedStatePathsImpl(const Utf8Str &strOldPath, … … 714 714 * Intended to be called by Machine::openConfigLoader() only. 715 715 * 716 * @param aOldPath old path (full)717 * @param aNewPath new path (full)716 * @param strOldPath old path (full) 717 * @param strNewPath new path (full) 718 718 * 719 719 * @note Locks the machine (for the snapshots tree) + this object + children for writing. 720 720 */ 721 721 void Snapshot::i_updateSavedStatePaths(const Utf8Str &strOldPath, 722 const Utf8Str &strNewPath)722 const Utf8Str &strNewPath) 723 723 { 724 724 LogFlowThisFunc(("aOldPath={%s} aNewPath={%s}\n", strOldPath.c_str(), strNewPath.c_str())); … … 1858 1858 * @note Locks VirtualBox and this object for writing. 1859 1859 * 1860 * @param aSuccess Whether Console was successful with the client-side snapshot things. 1860 * @param task 1861 * @param alock 1862 * @param aSuccess Whether Console was successful with the client-side 1863 * snapshot things. 1861 1864 * @return 1862 1865 */ … … 2617 2620 * @note Locks the machine + the snapshot + the media tree for writing! 2618 2621 * 2619 * @param pTask Task data.2622 * @param task Task data. 2620 2623 */ 2621 2624 void SessionMachine::i_deleteSnapshotHandler(DeleteSnapshotTask &task) -
trunk/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp
r63174 r65088 39 39 * @param aFilter The filter. 40 40 * @param aIdx The field index. 41 * @param aStrThe output string.41 * @param rstrOut The output string. 42 42 */ 43 43 static void i_usbFilterFieldToString(PCUSBFILTER aFilter, USBFILTERIDX aIdx, Utf8Str &rstrOut) -
trunk/src/VBox/Main/src-server/USBProxyBackend.cpp
r62485 r65088 559 559 * 560 560 * @returns Pointer to the head of the sorted doubly linked list. 561 * @param aDevices Head pointer (can be both singly and doubly linked list).561 * @param pDevices Head pointer (can be both singly and doubly linked list). 562 562 */ 563 563 static PUSBDEVICE sortDevices(PUSBDEVICE pDevices) -
trunk/src/VBox/Main/src-server/USBProxyService.cpp
r61667 r65088 264 264 * @param aMachine The machine to attach the device to. 265 265 * @param aId The UUID of the USB device to capture and attach. 266 * @param aCaptureFilename 266 267 * 267 268 * @returns COM status code and error info. … … 423 424 * 424 425 * @param aMachine The machine to detach devices from. 426 * @param aDone 427 * @param aAbnormal 425 428 * 426 429 * @returns COM status code, perhaps with error info. -
trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
r64972 r65088 3188 3188 * 3189 3189 * @param aId Machine UUID to look for. 3190 * @param aPermitInaccessible If true, inaccessible machines will be found;3190 * @param fPermitInaccessible If true, inaccessible machines will be found; 3191 3191 * if false, this will fail if the given machine is inaccessible. 3192 3192 * @param aSetError If true, set errorinfo if the machine is not found. … … 3349 3349 * Validates a machine group. 3350 3350 * 3351 * @param a MachineGroupMachine group.3352 * @param fPrimary 3351 * @param aGroup Machine group. 3352 * @param fPrimary Set if this is the primary group. 3353 3353 * 3354 3354 * @return S_OK or E_INVALIDARG … … 3452 3452 * object that matches either of them (not necessarily both) is returned. 3453 3453 * 3454 * @param aLocationFull location specification. Must not be empty.3454 * @param strLocation Full location specification. Must not be empty. 3455 3455 * @param aSetError If @c true , the appropriate error info is set in case 3456 3456 * when the hard disk is not found. … … 3773 3773 * directory as the current directory. 3774 3774 * 3775 * @param aPathPath to calculate the absolute path for.3775 * @param strPath Path to calculate the absolute path for. 3776 3776 * @param aResult Where to put the result (used only on success, can be the 3777 3777 * same Utf8Str instance as passed in @a aPath). … … 4823 4823 * directory which is normally unknown. 4824 4824 * 4825 * @param aFileNameFull file name which path is checked/created.4826 * @param aCreate Flag if the path should be created if it doesn't exist.4825 * @param strFileName Full file name which path is checked/created. 4826 * @param fCreate Flag if the path should be created if it doesn't exist. 4827 4827 * 4828 4828 * @return Extended error information on failure to check/create the path. -
trunk/src/VBox/Main/src-server/darwin/HostDnsServiceDarwin.cpp
r62485 r65088 169 169 kStateNetworkGlobalDNSKey); 170 170 /** 171 * 0:vvl@nb-mbp-i7-2(0)# scutil172 * > get State:/Network/Global/DNS173 * > d.show174 * <dictionary> {171 * # scutil 172 * \> get State:/Network/Global/DNS 173 * \> d.show 174 * \<dictionary\> { 175 175 * DomainName : vvl-domain 176 * SearchDomains : <array> {176 * SearchDomains : \<array\> { 177 177 * 0 : vvl-domain 178 178 * 1 : de.vvl-domain.com 179 179 * } 180 * ServerAddresses : <array> {180 * ServerAddresses : \<array\> { 181 181 * 0 : 192.168.1.4 182 182 * 1 : 192.168.1.1 -
trunk/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp
r62485 r65088 540 540 * @param puMbits Where to store the link speed. 541 541 */ 542 int NetIfGetLinkSpeed(const char * /*pcszIfName*/, uint32_t * /*puMbits*/) 543 { 542 int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits) 543 { 544 RT_NOREF(pcszIfName, puMbits); 544 545 return VERR_NOT_IMPLEMENTED; 545 546 } -
trunk/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp
r63677 r65088 327 327 * @param pcszModel the product ID string 328 328 * @param pszDesc where to store the description string (optional) 329 * @param cchDesc the size of the buffer in @ pszDesc329 * @param cchDesc the size of the buffer in @a pszDesc 330 330 * @param pszUdi where to store the UDI string (optional) 331 * @param cchUdi the size of the buffer in @ pszUdi331 * @param cchUdi the size of the buffer in @a pszUdi 332 332 */ 333 333 /* static */ -
trunk/src/VBox/Main/src-server/os2/USBProxyBackendOs2.cpp
r62485 r65088 77 77 } 78 78 79 LogRel(("USBProxy ServiceOs2: failed to register change notification, rc=%d\n", rc));79 LogRel(("USBProxyBackendOs2: failed to register change notification, rc=%d\n", rc)); 80 80 } 81 81 else 82 LogRel(("USBProxy ServiceOs2: failed to load usbcalls\n"));82 LogRel(("USBProxyBackendOs2: failed to load usbcalls\n")); 83 83 84 84 DosFreeModule(mhmod); 85 85 } 86 86 else 87 LogRel(("USBProxy ServiceOs2: failed to load usbcalls, rc=%d\n", rc));87 LogRel(("USBProxyBackendOs2: failed to load usbcalls, rc=%d\n", rc)); 88 88 mhmod = NULLHANDLE; 89 89 } … … 99 99 * Stop all service threads and free the device chain. 100 100 */ 101 USBProxy ServiceOs2::~USBProxyServiceOs2()101 USBProxyBackendOs2::~USBProxyBackendOs2() 102 102 { 103 103 LogFlowThisFunc(("\n")); … … 128 128 129 129 130 int USBProxy ServiceOs2::captureDevice(HostUSBDevice *aDevice)130 int USBProxyBackendOs2::captureDevice(HostUSBDevice *aDevice) 131 131 { 132 132 AssertReturn(aDevice, VERR_GENERAL_FAILURE); … … 147 147 148 148 149 int USBProxy ServiceOs2::releaseDevice(HostUSBDevice *aDevice)149 int USBProxyBackendOs2::releaseDevice(HostUSBDevice *aDevice) 150 150 { 151 151 AssertReturn(aDevice, VERR_GENERAL_FAILURE); … … 166 166 167 167 168 bool USBProxy ServiceOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters,168 bool USBProxyBackendOs2::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, 169 169 SessionMachine **aIgnoreMachine) 170 170 { … … 176 176 177 177 178 int USBProxy ServiceOs2::wait(RTMSINTERVAL aMillies)178 int USBProxyBackendOs2::wait(RTMSINTERVAL aMillies) 179 179 { 180 180 int rc = DosWaitEventSem(mhev, aMillies); … … 183 183 184 184 185 int USBProxy ServiceOs2::interruptWait(void)185 int USBProxyBackendOs2::interruptWait(void) 186 186 { 187 187 int rc = DosPostEventSem(mhev); … … 193 193 #include <stdio.h> 194 194 195 PUSBDEVICE USBProxy ServiceOs2::getDevices(void)195 PUSBDEVICE USBProxyBackendOs2::getDevices(void) 196 196 { 197 197 /*
Note:
See TracChangeset
for help on using the changeset viewer.