Changeset 20926 in vbox

Timestamp:

Jun 25, 2009 11:26:57 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49092

Message:

Python: fixed typo, improvments for the shell

Location:

trunk/src/VBox

Files:

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

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

@@ -374 +374 @@
     if len(args) == 1:
         print "Help page:"
-        for i in commands:
+        names = commands.keys()
+        names.sort()
+        for i in names:
             print "   ",i,":", commands[i][0]
     else:
@@ -398 +400 @@
         return 0
     os = ctx['vb'].getGuestOSType(mach.OSTypeId)
-    print "  Name: ",mach.name
-    print "  ID: ",mach.id
-    print "  OS Type: ",os.description
-    print "  CPUs:  %d" %(mach.CPUCount)
-    print "  RAM:  %dM" %(mach.memorySize)
-    print "  VRAM:  %dM" %(mach.VRAMSize)
-    print "  Monitors:  %d" %(mach.monitorCount)
-    print "  Clipboard mode:  %d" %(mach.clipboardMode)
-    print "  Machine status: " ,mach.sessionState
+    print " One can use setvar <mach> <var> <value> to change variable, using name in []."
+    print "  Name [name]: ",mach.name
+    print "  ID [id]: ",mach.id
+    print "  OS Type [n/a]: ",os.description
+    print "  CPUs [CPUCount]:  %d" %(mach.CPUCount)
+    print "  RAM [memorySize]:  %dM" %(mach.memorySize)
+    print "  VRAM [VRAMSize]:  %dM" %(mach.VRAMSize)
+    print "  Monitors [monitorCount]:  %d" %(mach.monitorCount)
+    print "  Clipboard mode [clipboardMode]:  %d" %(mach.clipboardMode)
+    print "  Machine status [n/a]: " ,mach.sessionState
     bios = mach.BIOSSettings
-    print "  ACPI: %s" %(asState(bios.ACPIEnabled))
-    print "  APIC: %s" %(asState(bios.IOAPICEnabled))
-    print "  PAE: %s" %(asState(mach.PAEEnabled))
-    print "  Hardware virtualization: ",asState(mach.HWVirtExEnabled)
-    print "  VPID support: ",asState(mach.HWVirtExVPIDEnabled)
-    print "  Hardware 3d acceleration: ",asState(mach.accelerate3DEnabled)
-    print "  Nested paging: ",asState(mach.HWVirtExNestedPagingEnabled)
-    print "  Last changed: ",time.asctime(time.localtime(mach.lastStateChange/1000))
+    print "  ACPI [BIOSSettings.ACPIEnabled]: %s" %(asState(bios.ACPIEnabled))
+    print "  APIC [BIOSSettings.IOAPICEnabled]: %s" %(asState(bios.IOAPICEnabled))
+    print "  PAE [PAEEnabled]: %s" %(asState(mach.PAEEnabled))
+    print "  Hardware virtualization [HWVirtExEnabled]: ",asState(mach.HWVirtExEnabled)
+    print "  VPID support [HWVirtExVPIDEnabled]: ",asState(mach.HWVirtExVPIDEnabled)
+    print "  Hardware 3d acceleration[accelerate3DEnabled]: ",asState(mach.accelerate3DEnabled)
+    print "  Nested paging [HWVirtExNestedPagingEnabled]: ",asState(mach.HWVirtExNestedPagingEnabled)
+    print "  Last changed [n/a]: ",time.asctime(time.localtime(mach.lastStateChange/1000))
 
     return 0
@@ -500 +503 @@
     if mach == None:
         return 0
-    session = ctx['mgr'].getSessionObject(vbox)
-    vbox.openSession(session, mach.id)
+    session = ctx['global'].openMachineSession(mach.id)
     mach = session.machine
     expr = 'mach.'+args[2]+' = '+args[3]
@@ -607 +609 @@
     session.close()
    
+    return 0
+
+
+def showLogCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: showLog <vm> <num>"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+
+    log = "VBox.log"
+    if (len(args) > 2):
+       log  += "."+args[2]
+    fileName = os.path.join(mach.logFolder, log)
+
+    try:
+        lf = open(fileName, 'r')
+    except IOError,e:
+        print "cannot open: ",e
+        return 0
+
+    for line in lf:
+        print line,
+    lf.close()
+
     return 0
 
@@ -647 +675 @@
             'monitorVbox':['Monitor what happens with Virtual Box for some time: monitorVbox 10', monitorVboxCmd],
             'portForward':['Setup permanent port forwarding for a VM, takes adapter number host port and guest port: portForward Win32 0 8080 80', portForwardCmd],
+            'showLog':['Show log file of the VM, : showLog Win32', showLogCmd],
             }
 

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

@@ -440 +440 @@
         if hasattr(self, "platform"):
             self.platform.deinit()
-             self.platform = None
+            self.platform = None
 
     def initPerThread(self):