Changeset 31016 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 22, 2010 4:39:23 PM (14 years ago)

Author:

vboxsync

Message:

Main: unbreak frontends broken by r63924

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxInternalManage.cpp (modified) (1 diff)
• VBoxManageControlVM.cpp (modified) (1 diff)
• VBoxManageGuestCtrl.cpp (modified) (1 diff)
• VBoxManageGuestProp.cpp (modified) (3 diffs)
• VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManageMisc.cpp (modified) (7 diffs)
• VBoxManageModifyVM.cpp (modified) (1 diff)
• VBoxManageSnapshot.cpp (modified) (1 diff)
• VBoxManageStorageController.cpp (modified) (1 diff)
• VBoxManageUSB.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1864 +1864 @@
         CHECK_ERROR_RET(aVirtualBox, FindMachine(Bstr(argv[0]), ptrMachine.asOutParam()), 1);
 
-    CHECK_ERROR_RET(ptrMachine, LockForSession(aSession, true /* fPermitShared */, NULL), 1);
+    SessionType_T st;
+    CHECK_ERROR_RET(ptrMachine, LockForSession(aSession, true /* fPermitShared */, &st), 1);
 
     /*

trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp

@@ -88 +88 @@
 
     /* open a session for the VM */
-    CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+    SessionType_T st;
+    CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
 
     do

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -286 +286 @@
         {
             /* open an existing session for VM */
-            CHECK_ERROR_BREAK(machine, LockForSession(a->session, true /* fPermitShared */, NULL));
+            SessionType_T st;
+            CHECK_ERROR_BREAK(machine, LockForSession(a->session, true /* fPermitShared */, &st));
             // @todo r=dj assert that it's an existing session
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -88 +88 @@
     {
         /* open a session for the VM - new or existing */
-        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+        SessionType_T st;
+        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
 
         /* get the mutable session machine */
@@ -153 +154 @@
     {
         /* open a session for the VM - new or existing */
-        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+        SessionType_T st;
+        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
 
         /* get the mutable session machine */
@@ -213 +215 @@
     {
         /* open a session for the VM - new or existing */
-        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+        SessionType_T st;
+        CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
 
         /* get the mutable session machine */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -2135 +2135 @@
 
         /* open an existing session for the VM */
-        rc = machine->LockForSession(a->session, true /* fPermitShared */, NULL);
+        SessionType_T st;
+        rc = machine->LockForSession(a->session, true /* fPermitShared */, &st);
         if (SUCCEEDED(rc))
             /* get the session machine */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -418 +418 @@
         {
             /* we have to open a session for this task */
-            CHECK_ERROR_BREAK(machine, LockForSession(a->session, false /* fPermitShared */, NULL));
+            SessionType_T st;
+            CHECK_ERROR_BREAK(machine, LockForSession(a->session, false /* fPermitShared */, &st));
             do
             {
@@ -452 +453 @@
         {
             /* we have to open a session for this task */
-            CHECK_ERROR_BREAK(machine, LockForSession(a->session, false /* fPermitShared */, NULL));
+            SessionType_T st;
+            CHECK_ERROR_BREAK(machine, LockForSession(a->session, false /* fPermitShared */, &st));
             do
             {
@@ -726 +728 @@
 
             /* open an existing session for the VM */
-            CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+            SessionType_T st;
+            CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
             /* get the session machine */
             CHECK_ERROR_RET(a->session, COMGETTER(Machine)(machine.asOutParam()), 1);
@@ -740 +743 @@
         {
             /* open a session for the VM */
-            CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, NULL), 1);
+            SessionType_T st;
+            CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, &st), 1);
 
             /* get the mutable session machine */
@@ -790 +794 @@
 
             /* open an existing session for the VM */
-            CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, NULL), 1);
+            SessionType_T st;
+            CHECK_ERROR_RET(machine, LockForSession(a->session, true /* fPermitShared */, &st), 1);
             /* get the session machine */
             CHECK_ERROR_RET(a->session, COMGETTER(Machine)(machine.asOutParam()), 1);
@@ -804 +809 @@
         {
             /* open a session for the VM */
-            CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, NULL), 1);
+            SessionType_T st;
+            CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, &st), 1);
 
             /* get the mutable session machine */
@@ -874 +880 @@
 
     /* open an existing session for the VM. */
-    CHECK_ERROR(machine, LockForSession(a->session, true /* fPermitShared */, NULL));
+    SessionType_T st;
+    CHECK_ERROR(machine, LockForSession(a->session, true /* fPermitShared */, &st));
     if (SUCCEEDED(rc))
     {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -312 +312 @@
 
     /* open a session for the VM */
-    CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, NULL), 1);
+    SessionType_T st;
+    CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, &st), 1);
 
     /* get the mutable session machine */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp

@@ -240 +240 @@
     {
         /* we have to open a session for this task (new or shared) */
-        rc = pMachine->LockForSession(a->session, true /* fPermitShared */, NULL);
+        SessionType_T st;
+        rc = pMachine->LockForSession(a->session, true /* fPermitShared */, &st);
         ComPtr<IConsole> console;
         CHECK_ERROR_BREAK(a->session, COMGETTER(Console)(console.asOutParam()));

trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp

@@ -755 +755 @@
 
     /* open a session for the VM */
-    CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, NULL), 1);
+    SessionType_T st;
+    CHECK_ERROR_RET(machine, LockForSession(a->session, false /* fPermitShared */, &st), 1);
 
     /* get the mutable session machine */

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUSB.cpp

@@ -417 +417 @@
     {
         /* open a session for the VM */
-        CHECK_ERROR_RET(cmd.mMachine, LockForSession(a->session, false /* fPermitShared */, NULL), 1);
+        SessionType_T st;
+        CHECK_ERROR_RET(cmd.mMachine, LockForSession(a->session, false /* fPermitShared */, &st), 1);
         /* get the mutable session machine */
         a->session->COMGETTER(Machine)(cmd.mMachine.asOutParam());