Changeset 27953 in vbox

Timestamp:

Apr 1, 2010 8:09:40 PM (15 years ago)

Author:

vboxsync

Message:

python shell: bits

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (7 diffs)

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

@@ -1 +1 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2009 Sun Microsystems, Inc.
+# Copyright (C) 2009-2010 Sun Microsystems, Inc.
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #                                                                               #
 # It also provides you with examples on how to use VirtualBox's Python API.     #
-# This shell is even somewhat documented and supports TAB-completion and        #
+# This shell is even somewhat documented, supports TAB-completion and           #
 # history if you have Python readline installed.                                #
 #                                                                               #
+# Finally, shell allows arbitrary custom extensions, just create                #
+# .VirtualBox/shexts/ and drop your extensions there.                           #
 #                                                Enjoy.                         #
 ################################################################################
@@ -525 +527 @@
     return 0
 
-def getControllerType(type):
-    if type == 0:
-        return "Null"
-    elif  type == 1:
-        return "LsiLogic"
-    elif type == 2:
-        return "BusLogic"
-    elif type == 3:
-        return "IntelAhci"
-    elif type == 4:
-        return "PIIX3"
-    elif type == 5:
-        return "PIIX4"
-    elif type == 6:
-        return "ICH6"
-    else:
-        return "Unknown"
-
 def asEnumElem(ctx,enum,elem):
     all = ctx['ifaces'].all_values(enum)
@@ -589 +573 @@
 
     print "  HPET [hpetEnabled]: %s" %(asState(mach.hpetEnabled))
+    if mach.audioAdapter.enabled:
+        print "  Audio [via audioAdapter]: chip %s; host driver %s" %(asEnumElem(ctx,"AudioControllerType", mach.audioAdapter.audioController), asEnumElem(ctx,"AudioDriverType",  mach.audioAdapter.audioDriver))
     print "  CPU hotplugging [CPUHotPlugEnabled]: %s" %(asState(mach.CPUHotPlugEnabled))
 
@@ -601 +587 @@
         print "  Controllers:"
     for controller in controllers:
-        print "    %s %s bus: %d" % (controller.name, getControllerType(controller.controllerType), controller.bus)
+        print "    %s %s bus: %d" % (controller.name, asEnumElem(ctx,"StorageControllerType", controller.controllerType), controller.bus)
 
     attaches = ctx['global'].getArray(mach, 'mediumAttachments')
@@ -1347 +1333 @@
             group = False
             continue
+        if ch == 'W':
+            # just wait a bit
+            time.sleep(0.3)
+            continue
         if  ch == '^' or  ch == '|' or ch == '$' or ch == '_':
             if ch == '^':
@@ -1453 +1443 @@
             'gueststats':['Print available guest stats (only Windows guests with additions so far): gueststats Win32', gueststatsCmd, 0],
             'plugcpu':['Add a CPU to a running VM: plugcpu Win 1', plugcpuCmd, 0],
-            'unplugcpu':['Remove a CPU from a running VM: plugcpu Win 1', unplugcpuCmd, 0],
+            'unplugcpu':['Remove a CPU from a running VM (additions required, Windows cannot unplug): unplugcpu Linux 1', unplugcpuCmd, 0],
             }