Changeset 63384 in vbox for trunk/src/VBox/Frontends/VBoxManage
- Timestamp:
- Aug 12, 2016 6:57:52 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 110030
- Location:
- trunk/src/VBox/Frontends/VBoxManage
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp
r63300 r63384 453 453 static RTEXITCODE CmdLoadSyms(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 454 454 { 455 RT_NOREF(aSession); 455 456 HRESULT rc; 456 457 … … 529 530 static RTEXITCODE CmdLoadMap(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 530 531 { 532 RT_NOREF(aSession); 531 533 HRESULT rc; 532 534 … … 614 616 static RTEXITCODE CmdSetHDUUID(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 615 617 { 618 RT_NOREF(aVirtualBox, aSession); 616 619 Guid uuid; 617 620 RTUUID rtuuid; … … 692 695 static RTEXITCODE CmdDumpHDInfo(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 693 696 { 697 RT_NOREF(aVirtualBox, aSession); 698 694 699 /* we need exactly one parameter: the image file */ 695 700 if (argc != 1) … … 1072 1077 static RTEXITCODE CmdListPartitions(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 1073 1078 { 1079 RT_NOREF(aVirtualBox, aSession); 1074 1080 Utf8Str rawdisk; 1075 1081 … … 1146 1152 static RTEXITCODE CmdCreateRawVMDK(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 1147 1153 { 1154 RT_NOREF(aVirtualBox, aSession); 1148 1155 HRESULT rc = S_OK; 1149 1156 Utf8Str filename; … … 1865 1872 static RTEXITCODE CmdRenameVMDK(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 1866 1873 { 1874 RT_NOREF(aVirtualBox, aSession); 1867 1875 Utf8Str src; 1868 1876 Utf8Str dst; … … 1931 1939 static RTEXITCODE CmdConvertToRaw(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 1932 1940 { 1941 RT_NOREF(aVirtualBox, aSession); 1933 1942 Utf8Str srcformat; 1934 1943 Utf8Str src; … … 2086 2095 static RTEXITCODE CmdConvertHardDisk(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 2087 2096 { 2097 RT_NOREF(aVirtualBox, aSession); 2088 2098 Utf8Str srcformat; 2089 2099 Utf8Str dstformat; … … 2217 2227 static RTEXITCODE CmdRepairHardDisk(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 2218 2228 { 2229 RT_NOREF(aVirtualBox, aSession); 2219 2230 Utf8Str image; 2220 2231 Utf8Str format; … … 2435 2446 static RTEXITCODE CmdGeneratePasswordHash(int argc, char **argv, ComPtr<IVirtualBox> aVirtualBox, ComPtr<ISession> aSession) 2436 2447 { 2448 RT_NOREF(aVirtualBox, aSession); 2449 2437 2450 /* one parameter, the password to hash */ 2438 2451 if (argc != 1) -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
r63314 r63384 2016 2016 } 2017 2017 2018 #if 0 /* unused */ 2018 2019 /** 2019 2020 * Checks whether a specific directory exists on the destination, based … … 2032 2033 pszDir, fExists); 2033 2034 } 2035 #endif /* unused */ 2034 2036 2035 2037 /** … … 2083 2085 } 2084 2086 2087 #if 0 /* unused */ 2085 2088 /** 2086 2089 * Checks whether a specific file exists on the destination, based on the … … 2099 2102 pszFile, fExists); 2100 2103 } 2104 #endif /* unused */ 2101 2105 2102 2106 /** -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp
r62493 r63384 121 121 } 122 122 123 static Bstr getObjectName(ComPtr<IVirtualBox> aVirtualBox, 124 ComPtr<IUnknown> aObject) 123 static Bstr getObjectName(ComPtr<IUnknown> aObject) 125 124 { 126 125 HRESULT rc; … … 141 140 } 142 141 143 static void listAffectedMetrics(ComPtr<IVirtualBox> aVirtualBox, 144 ComSafeArrayIn(IPerformanceMetric*, aMetrics)) 142 static void listAffectedMetrics(ComSafeArrayIn(IPerformanceMetric*, aMetrics)) 145 143 { 146 144 HRESULT rc; … … 158 156 CHECK_ERROR(metrics[i], COMGETTER(MetricName)(metricName.asOutParam())); 159 157 RTPrintf("%-10ls %-20ls\n", 160 getObjectName( aVirtualBox,object).raw(), metricName.raw());158 getObjectName(object).raw(), metricName.raw()); 161 159 } 162 160 RTPrintf("\n"); … … 210 208 CHECK_ERROR(metricInfo[i], COMGETTER(Description)(description.asOutParam())); 211 209 RTPrintf("%-15ls %-40ls %-4ls %10d %10d %10u %10u %ls\n", 212 getObjectName( aVirtualBox,object).raw(), metricName.raw(), unit.raw(),210 getObjectName(object).raw(), metricName.raw(), unit.raw(), 213 211 minimum, maximum, period, count, description.raw()); 214 212 } … … 273 271 274 272 if (listMatches) 275 listAffectedMetrics(aVirtualBox, 276 ComSafeArrayAsInParam(affectedMetrics)); 273 listAffectedMetrics(ComSafeArrayAsInParam(affectedMetrics)); 277 274 278 275 return RTEXITCODE_SUCCESS; … … 321 318 Bstr metricUnit(retUnits[i]); 322 319 Bstr metricName(retNames[i]); 323 RTPrintf("%-15ls %-40ls ", getObjectName( aVirtualBox,retObjects[i]).raw(), metricName.raw());320 RTPrintf("%-15ls %-40ls ", getObjectName(retObjects[i]).raw(), metricName.raw()); 324 321 const char *separator = ""; 325 322 for (unsigned j = 0; j < retLengths[i]; j++) … … 469 466 470 467 if (listMatches) 471 listAffectedMetrics(aVirtualBox, 472 ComSafeArrayAsInParam(affectedMetrics)); 468 listAffectedMetrics(ComSafeArrayAsInParam(affectedMetrics)); 473 469 if (!affectedMetrics.size()) 474 470 return RTEXITCODE_FAILURE; … … 516 512 Bstr metricUnit(retUnits[j]); 517 513 Bstr metricName(retNames[j]); 518 RTPrintf("%-12s %-10ls %-20ls ", ts, getObjectName( aVirtualBox,retObjects[j]).raw(), metricName.raw());514 RTPrintf("%-12s %-10ls %-20ls ", ts, getObjectName(retObjects[j]).raw(), metricName.raw()); 519 515 const char *separator = ""; 520 516 for (unsigned k = 0; k < retLengths[j]; k++) … … 576 572 577 573 if (listMatches) 578 listAffectedMetrics(aVirtualBox, 579 ComSafeArrayAsInParam(affectedMetrics)); 574 listAffectedMetrics(ComSafeArrayAsInParam(affectedMetrics)); 580 575 581 576 return RTEXITCODE_SUCCESS; … … 619 614 620 615 if (listMatches) 621 listAffectedMetrics(aVirtualBox, 622 ComSafeArrayAsInParam(affectedMetrics)); 616 listAffectedMetrics(ComSafeArrayAsInParam(affectedMetrics)); 623 617 624 618 return RTEXITCODE_SUCCESS; … … 654 648 } 655 649 656 #endif /* VBOX_ONLY_DOCS */657 650 #endif /* !VBOX_ONLY_DOCS */ 651
Note:
See TracChangeset
for help on using the changeset viewer.