Changeset 31014 in vbox

Timestamp:

Jul 22, 2010 4:24:56 PM (15 years ago)

Author:

vboxsync

Message:

Python: update for new session API

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (11 diffs)
• Main/glue/vboxapi.py (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -233 +233 @@
     perf = ctx['perf']
     session = mgr.getSessionObject(vb)
-    uuid = mach.id
-    progress = vb.openRemoteSession(session, uuid, type, "")
+    progress = mach.launchVMProcess(session, type, "")
     if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0:
         # we ignore exceptions to allow starting VM even if
@@ -492 +491 @@
         vb = ctx['vb']
         session = ctx['mgr'].getSessionObject(vb)
-        vb.openExistingSession(session, mach.id)
+        mach.lockForSession(session, True)
     except Exception,e:
         printErr(ctx, "Session to '%s' not open: %s" %(mach.name,str(e)))
@@ -498 +497 @@
             traceback.print_exc()
         return
-    if session.state != ctx['const'].SessionState_Open:
+    if session.state != ctx['const'].SessionState_Locked:
         print "Session to '%s' in wrong state: %s" %(mach.name, session.state)
         session.close()
@@ -536 +535 @@
 
 def cmdClosedVm(ctx,mach,cmd,args=[],save=True):
-    session = ctx['global'].openMachineSession(mach.id)
+    session = ctx['global'].openMachineSession(mach, False)
     mach = session.machine
     try:
@@ -551 +550 @@
 
 def cmdAnyVm(ctx,mach,cmd, args=[],save=False):
-    session = ctx['global'].openMachineSession(mach.id)
+    session = ctx['global'].openMachineSession(mach)
     mach = session.machine
     try:
@@ -1039 +1038 @@
     if mach == None:
         return 0
-    if str(mach.sessionState) != str(ctx['const'].SessionState_Open):
+    if str(mach.sessionState) != str(ctx['const'].SessionState_Locked):
         cmdClosedVm(ctx, mach, lambda ctx, mach, a: guestExec (ctx, mach, None, ' '.join(args[2:])))
     else:
@@ -1129 +1128 @@
     if mach == None:
         return 0
-    if str(mach.sessionState) != str(ctx['const'].SessionState_Open):
+    if str(mach.sessionState) != str(ctx['const'].SessionState_Locked):
         if mach.CPUHotPlugEnabled:
             cmdClosedVm(ctx, mach, plugcpu, [True, int(args[2])])
@@ -1143 +1142 @@
     if mach == None:
         return 0
-    if str(mach.sessionState) != str(ctx['const'].SessionState_Open):
+    if str(mach.sessionState) != str(ctx['const'].SessionState_Locked):
         if mach.CPUHotPlugEnabled:
             cmdClosedVm(ctx, mach, plugcpu, [False, int(args[2])])
@@ -1348 +1347 @@
     guestPort = int(args[4])
     proto = "TCP"
-    session = ctx['global'].openMachineSession(mach.id)
+    session = ctx['global'].openMachineSession(mach)
     mach = session.machine
 
@@ -2533 +2532 @@
     if len(cmdargs) > 1:
         rosession = 0
-        session = ctx['global'].openMachineSession(mach.id);
+        session = ctx['global'].openMachineSession(mach, False);
         mach = session.machine;
 
@@ -2710 +2709 @@
     func = args[3]
     session = None
-    session = ctx['global'].openMachineSession(vm.id)
+    session = ctx['global'].openMachineSession(vm)
     vm = session.machine
     adapter = vm.getNetworkAdapter(nicnum)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -519 +519 @@
         self.platform.initPerThread()
 
-    def openMachineSession(self, machineId):
+    def openMachineSession(self, mach, permitSharing = True):
          session = self.mgr.getSessionObject(self.vbox)
-         try:
-             self.vbox.openExistingSession(session, machineId)
-         except:
-             self.vbox.openSession(session, machineId)
+         mach.lockForSession(session, permitSharing)
          return session