vbox的更動 51092 路徑 trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

時間撮記:

2014-4-16 下午05:57:25 (11 年 以前)

作者:

vboxsync

訊息:

6813 src-client/MachineDebuggerImpl.cpp + various formatting changes

檔案:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (修改) (10 筆差異)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1142 +1142 @@
                     if (RT_SUCCESS(rc))
                     {
-                        switch (u32GuestFlags & (VMMDEV_CREDENTIALS_JUDGE_OK | VMMDEV_CREDENTIALS_JUDGE_DENY | VMMDEV_CREDENTIALS_JUDGE_NOJUDGEMENT))
+                        switch (u32GuestFlags & (VMMDEV_CREDENTIALS_JUDGE_OK | VMMDEV_CREDENTIALS_JUDGE_DENY |
+                                                 VMMDEV_CREDENTIALS_JUDGE_NOJUDGEMENT))
                         {
                             case VMMDEV_CREDENTIALS_JUDGE_DENY:        guestJudgement = AuthGuestAccessDenied;  break;
@@ -1209 +1210 @@
     AssertComRCReturn(hrc, VERR_ACCESS_DENIED);
 
-    LogFlowFunc(("allowMultiConnection %d, reuseSingleConnection = %d, mcVRDPClients = %d, mu32SingleRDPClientId = %d\n", allowMultiConnection, reuseSingleConnection, mcVRDPClients, mu32SingleRDPClientId));
+    LogFlowFunc(("allowMultiConnection %d, reuseSingleConnection = %d, mcVRDPClients = %d, mu32SingleRDPClientId = %d\n",
+                 allowMultiConnection, reuseSingleConnection, mcVRDPClients, mu32SingleRDPClientId));
 
     if (allowMultiConnection == FALSE)
@@ -4287 +4289 @@
                     {
                         VMSTATE enmVMState = VMR3GetStateU(ptrVM.rawUVM());
-                        if (    enmVMState == VMSTATE_RUNNING    /** @todo LiveMigration: Forbid or deal correctly with the _LS variants */
+                        if (    enmVMState == VMSTATE_RUNNING    /** @todo LiveMigration: Forbid or deal
+                                                                     correctly with the _LS variants */
                             ||  enmVMState == VMSTATE_SUSPENDED)
                         {
@@ -6731 +6734 @@
                 vrc = RTDirCreateFullPath(pszDumpDir, 0700);
                 if (RT_FAILURE(vrc))
-                    throw setError(E_FAIL, "Failed to setup CoreDumper. Couldn't create dump directory '%s' (%Rrc)\n", pszDumpDir, vrc);
+                    throw setError(E_FAIL, "Failed to setup CoreDumper. Couldn't create dump directory '%s' (%Rrc)\n",
+                                   pszDumpDir, vrc);
             }
 
@@ -7898 +7902 @@
 
                 default:
-                    AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
+                    AssertMsgFailed(("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
+                                    VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
                     that->setMachineState(MachineState_Paused);
                     break;
@@ -7937 +7942 @@
             AssertMsg(   that->mMachineState == MachineState_LiveSnapshotting
                       || that->mMachineState == MachineState_Teleporting,
-                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
+                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
+                      VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
             break;
 
         case VMSTATE_RUNNING_FT:
             AssertMsg(that->mMachineState == MachineState_FaultTolerantSyncing,
-                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState), VMR3GetStateName(enmOldState),  VMR3GetStateName(enmState) ));
+                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
+                      VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
             break;
 
@@ -8702 +8709 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("u32ClientId = %d, pDevList=%p, cbDevList = %d, fDescExt = %d\n", u32ClientId, pDevList, cbDevList, fDescExt));
+    LogFlowThisFunc(("u32ClientId = %d, pDevList=%p, cbDevList = %d, fDescExt = %d\n",
+                     u32ClientId, pDevList, cbDevList, fDescExt));
 
     AutoCaller autoCaller(this);
@@ -9062 +9070 @@
                 MachineDebugger *machineDebugger = pConsole->getMachineDebugger();
                 if (machineDebugger)
-                    machineDebugger->flushQueuedSettings();
+                    machineDebugger->i_flushQueuedSettings();
 
                 /*
@@ -9083 +9091 @@
                             ErrorInfoKeeper eik;
                             pConsole->setVMRuntimeErrorCallbackF(0, "BrokenSharedFolder",
-                                    N_("The shared folder '%s' could not be set up: %ls.\n"
-                                       "The shared folder setup will not be complete. It is recommended to power down the virtual "
-                                       "machine and fix the shared folder settings while the machine is not running"),
+                                   N_("The shared folder '%s' could not be set up: %ls.\n"
+                                      "The shared folder setup will not be complete. It is recommended to power down the virtual "
+                                      "machine and fix the shared folder settings while the machine is not running"),
                                     it->first.c_str(), eik.getText().raw());
                         }
@@ -9513 +9521 @@
 
             pTask->mProgress->SetNextOperation(Bstr(tr("Saving the machine state")).raw(),
-                                               pTask->ulMemSize);       // operation weight, same as computed when setting up progress object
+                                               pTask->ulMemSize);       // operation weight, same as computed
+                                                                        // when setting up progress object
             if (!pTask->bstrSavedStateFile.isEmpty())
             {