Changeset 47908 in vbox for trunk/src/VBox/Frontends/VBoxManage
- Timestamp:
- Aug 20, 2013 12:57:00 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 88214
- Location:
- trunk/src/VBox/Frontends/VBoxManage
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h
r45156 r47908 206 206 ComPtr<IMachine> machine, 207 207 VMINFO_DETAILS details = VMINFO_NONE, 208 ComPtr 208 ComPtr<IConsole> console = ComPtr<IConsole>()); 209 209 const char *machineStateToName(MachineState_T machineState, bool fShort); 210 210 HRESULT showBandwidthGroups(ComPtr<IBandwidthControl> &bwCtrl, -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
r47774 r47908 65 65 unsigned int getMaxNics(IVirtualBox* vbox, IMachine* mach) 66 66 { 67 ComPtr 67 ComPtr<ISystemProperties> info; 68 68 ChipsetType_T aChipset; 69 69 ULONG NetworkAdapterCount = 0; … … 91 91 92 92 /* try to find the given machine */ 93 ComPtr 93 ComPtr<IMachine> machine; 94 94 CHECK_ERROR(a->virtualBox, FindMachine(Bstr(a->argv[0]).raw(), 95 95 machine.asOutParam())); … … 932 932 if (attach) 933 933 { 934 ComPtr 934 ComPtr<IHost> host; 935 935 CHECK_ERROR_BREAK(a->virtualBox, COMGETTER(Host)(host.asOutParam())); 936 936 SafeIfaceArray <IHostUSBDevice> coll; 937 937 CHECK_ERROR_BREAK(host, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll))); 938 ComPtr 938 ComPtr<IHostUSBDevice> dev; 939 939 CHECK_ERROR_BREAK(host, FindUSBDeviceByAddress(Bstr(a->argv[2]).raw(), 940 940 dev.asOutParam())); … … 945 945 SafeIfaceArray <IUSBDevice> coll; 946 946 CHECK_ERROR_BREAK(console, COMGETTER(USBDevices)(ComSafeArrayAsOutParam(coll))); 947 ComPtr 947 ComPtr<IUSBDevice> dev; 948 948 CHECK_ERROR_BREAK(console, FindUSBDeviceByAddress(Bstr(a->argv[2]).raw(), 949 949 dev.asOutParam())); … … 962 962 else 963 963 { 964 ComPtr 964 ComPtr<IUSBDevice> dev; 965 965 CHECK_ERROR_BREAK(console, DetachUSBDevice(usbId.raw(), 966 966 dev.asOutParam())); … … 1212 1212 } 1213 1213 /* guest is running; update IGuest */ 1214 ComPtr 1214 ComPtr<IGuest> pGuest; 1215 1215 rc = console->COMGETTER(Guest)(pGuest.asOutParam()); 1216 1216 if (SUCCEEDED(rc)) -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp
r47774 r47908 354 354 ComPtr<IMachine> machine, 355 355 VMINFO_DETAILS details /*= VMINFO_NONE*/, 356 ComPtr<IConsole> console /*= ComPtr 356 ComPtr<IConsole> console /*= ComPtr<IConsole> ()*/) 357 357 { 358 358 HRESULT rc; … … 580 580 RTPrintf("None\n"); 581 581 582 ComPtr 582 ComPtr<IBIOSSettings> biosSettings; 583 583 CHECK_ERROR2_RET(machine, COMGETTER(BIOSSettings)(biosSettings.asOutParam()), hrcCheck); 584 584 … … 1895 1895 for (size_t index = 0; index < coll.size(); ++index) 1896 1896 { 1897 ComPtr 1897 ComPtr<IHostUSBDevice> dev = coll[index]; 1898 1898 1899 1899 /* Query info. */ … … 1984 1984 for (size_t index = 0; index < coll.size(); ++index) 1985 1985 { 1986 ComPtr 1986 ComPtr<IUSBDevice> dev = coll[index]; 1987 1987 1988 1988 /* Query info. */ … … 2141 2141 for (size_t i = 0; i < folders.size(); ++i) 2142 2142 { 2143 ComPtr 2143 ComPtr<ISharedFolder> sf = folders[i]; 2144 2144 2145 2145 Bstr name, hostPath; … … 2172 2172 for (size_t i = 0; i < folders.size(); ++i) 2173 2173 { 2174 ComPtr 2174 ComPtr<ISharedFolder> sf = folders[i]; 2175 2175 2176 2176 Bstr name, hostPath; … … 2591 2591 2592 2592 /* try to find the given machine */ 2593 ComPtr 2593 ComPtr<IMachine> machine; 2594 2594 CHECK_ERROR(a->virtualBox, FindMachine(Bstr(VMNameOrUuid).raw(), 2595 2595 machine.asOutParam())); -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp
r47483 r47908 358 358 for (size_t i = 0; i < CollPtr.size(); ++i) 359 359 { 360 ComPtr 360 ComPtr<IHostUSBDevice> dev = CollPtr[i]; 361 361 362 362 /* Query info. */ -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
r44528 r47908 78 78 else 79 79 { 80 ComPtr 80 ComPtr<IMachine> machine; 81 81 rc = aVirtualBox->FindMachine(Bstr(argv[0]).raw(), 82 82 machine.asOutParam()); -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp
r46658 r47908 956 956 if (fTransient) 957 957 { 958 ComPtr 958 ComPtr<IConsole> console; 959 959 960 960 /* open an existing session for the VM */ … … 1022 1022 if (fTransient) 1023 1023 { 1024 ComPtr 1024 ComPtr<IConsole> console; 1025 1025 1026 1026 /* open an existing session for the VM */ -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
r47403 r47908 444 444 RTGETOPTUNION ValueUnion; 445 445 RTGETOPTSTATE GetOptState; 446 ComPtr 447 ComPtr 446 ComPtr<IMachine> machine; 447 ComPtr<IBIOSSettings> biosSettings; 448 448 449 449 /* VM ID + at least one parameter. Parameter arguments are checked -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp
r47376 r47908 399 399 USBFilterCmd::USBFilter &f = cmd.mFilter; 400 400 401 ComPtr 402 ComPtr 401 ComPtr<IHost> host; 402 ComPtr<IUSBDeviceFilters> flts; 403 403 if (cmd.mGlobal) 404 404 CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), 1); … … 419 419 if (cmd.mGlobal) 420 420 { 421 ComPtr 421 ComPtr<IHostUSBDeviceFilter> flt; 422 422 CHECK_ERROR_BREAK(host, CreateUSBDeviceFilter(f.mName.raw(), 423 423 flt.asOutParam())); … … 445 445 else 446 446 { 447 ComPtr 447 ComPtr<IUSBDeviceFilter> flt; 448 448 CHECK_ERROR_BREAK(flts, CreateDeviceFilter(f.mName.raw(), 449 449 flt.asOutParam())); … … 477 477 CHECK_ERROR_BREAK(host, COMGETTER(USBDeviceFilters)(ComSafeArrayAsOutParam(coll))); 478 478 479 ComPtr 479 ComPtr<IHostUSBDeviceFilter> flt = coll[cmd.mIndex]; 480 480 481 481 if (!f.mName.isEmpty()) … … 504 504 CHECK_ERROR_BREAK(flts, COMGETTER(DeviceFilters)(ComSafeArrayAsOutParam(coll))); 505 505 506 ComPtr 506 ComPtr<IUSBDeviceFilter> flt = coll[cmd.mIndex]; 507 507 508 508 if (!f.mName.isEmpty()) … … 531 531 if (cmd.mGlobal) 532 532 { 533 ComPtr 533 ComPtr<IHostUSBDeviceFilter> flt; 534 534 CHECK_ERROR_BREAK(host, RemoveUSBDeviceFilter(cmd.mIndex)); 535 535 } 536 536 else 537 537 { 538 ComPtr 538 ComPtr<IUSBDeviceFilter> flt; 539 539 CHECK_ERROR_BREAK(flts, RemoveDeviceFilter(cmd.mIndex, flt.asOutParam())); 540 540 }
Note:
See TracChangeset
for help on using the changeset viewer.