Index: /trunk/Config.kmk =================================================================== --- /trunk/Config.kmk (revision 59794) +++ /trunk/Config.kmk (revision 59795) @@ -6474,3 +6474,2 @@ $(MAKE) VBOX_QUICK=1 - Index: /trunk/doc/manual/en_US/SDKRef.xml =================================================================== --- /trunk/doc/manual/en_US/SDKRef.xml (revision 59794) +++ /trunk/doc/manual/en_US/SDKRef.xml (revision 59795) @@ -781,6 +781,4 @@ . - The minimum supported Python version is 2.6. - As indicated in , the COM/XPCOM API gives better performance without the SOAP overhead, and @@ -790,13 +788,16 @@ platform On On Mac OS X only the Python versions bundled with the OS - are officially supported. This means 2.6 and 2.7 for 10.8 and later. + are officially supported. This means Python 2.3 for 10.4, Python + 2.5 for 10.5 and Python 2.5 and 2.6 for 10.6. ). On Windows, you can use the Main API from Python if the Win32 extensions package for Python See http://sourceforge.net/project/showfiles.php?group_id=78018. - is installed. Versions of Python Win32 extensions earlier + is installed. Version of Python Win32 extensions earlier than 2.16 are known to have bugs, leading to issues with VirtualBox - Python bindings, so please make sure to use latest available Python - and Win32 extensions. + Python bindings, and also some early builds of Python 2.5 for Windows + have issues with reporting platform name on some Windows versions, so + please make sure to use latest available Python and Win32 + extensions. The VirtualBox OOWS for Python relies on the Python ZSI SOAP @@ -1496,6 +1497,4 @@ the glue layer if you want to use a different Python installation. - - The minimum supported Python version is 2.6. In this layer, the class Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py =================================================================== --- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 59794) +++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (revision 59795) @@ -2,5 +2,4 @@ # -*- coding: utf-8 -*- # $Id$ - """ VirtualBox Python Shell. @@ -20,9 +19,7 @@ """ -from __future__ import print_function - __copyright__ = \ """ -Copyright (C) 2009-2016 Oracle Corporation +Copyright (C) 2009-2015 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as @@ -37,6 +34,5 @@ -import os -import sys +import os, sys import traceback import shlex @@ -46,4 +42,5 @@ from optparse import OptionParser from pprint import pprint + @@ -155,5 +152,5 @@ matches.append(word) - except Exception as e: + except Exception, e: printErr(self.ctx, e) if g_fVerbose: @@ -167,5 +164,5 @@ comps = {} - for (key, _value) in list(cmds.items()): + for (key, _value) in cmds.items(): comps[key] = None completer = CompleterNG(comps, ctx) @@ -192,5 +189,5 @@ try: while not progress.completed: - print("%s %%\r" % (colored(str(progress.percent), 'red')), end="") + print "%s %%\r" % (colored(str(progress.percent), 'red')), sys.stdout.flush() progress.waitForCompletion(wait) @@ -200,22 +197,22 @@ return 1 except KeyboardInterrupt: - print("Interrupted.") + print "Interrupted." ctx['interrupt'] = True if progress.cancelable: - print("Canceling task...") + print "Canceling task..." progress.cancel() return 0 def printErr(_ctx, e): - oVBoxMgr = _ctx['global'] + oVBoxMgr = _ctx['global']; if oVBoxMgr.errIsOurXcptKind(e): - print(colored('%s: %s' % (oVBoxMgr.xcptToString(e), oVBoxMgr.xcptGetMessage(e)), 'red')) - else: - print(colored(str(e), 'red')) + print colored('%s: %s' % (oVBoxMgr.xcptToString(e), oVBoxMgr.xcptGetMessage(e)), 'red'); + else: + print colored(str(e), 'red') def reportError(_ctx, progress): errorinfo = progress.errorInfo if errorinfo: - print(colored("Error in module '%s': %s" % (errorinfo.component, errorinfo.text), 'red')) + print colored("Error in module '%s': %s" % (errorinfo.component, errorinfo.text), 'red') def colCat(_ctx, strg): @@ -244,5 +241,5 @@ mach = vbox.createMachine("", name, [], kind, "") mach.saveSettings() - print("created machine with UUID", mach.id) + print "created machine with UUID", mach.id vbox.registerMachine(mach) # update cache @@ -251,5 +248,5 @@ def removeVm(ctx, mach): uuid = mach.id - print("removing machine ", mach.name, "with UUID", uuid) + print "removing machine ", mach.name, "with UUID", uuid cmdClosedVm(ctx, mach, detachVmDevice, ["ALL"]) disks = mach.unregister(ctx['global'].constants.CleanupMode_Full) @@ -257,5 +254,5 @@ progress = mach.deleteConfig(disks) if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0: - print("Success!") + print "Success!" else: reportError(ctx, progress) @@ -274,5 +271,5 @@ try: perf.setup(['*'], [mach], 10, 15) - except Exception as e: + except Exception, e: printErr(ctx, e) if g_fVerbose: @@ -327,17 +324,17 @@ return for metric in ctx['perf'].query(["*"], [mach]): - print(metric['name'], metric['values_as_string']) + print metric['name'], metric['values_as_string'] def guestExec(ctx, machine, console, cmds): - exec(cmds) + exec cmds def printMouseEvent(_ctx, mev): - print("Mouse : mode=%d x=%d y=%d z=%d w=%d buttons=%x" % (mev.mode, mev.x, mev.y, mev.z, mev.w, mev.buttons)) + print "Mouse : mode=%d x=%d y=%d z=%d w=%d buttons=%x" % (mev.mode, mev.x, mev.y, mev.z, mev.w, mev.buttons) def printKbdEvent(ctx, kev): - print("Kbd: ", ctx['global'].getArray(kev, 'scancodes')) + print "Kbd: ", ctx['global'].getArray(kev, 'scancodes') def printMultiTouchEvent(ctx, mtev): - print("MultiTouch : contacts=%d time=%d" % (mtev.contactCount, mtev.scanTime)) + print "MultiTouch : contacts=%d time=%d" % (mtev.contactCount, mtev.scanTime) xPositions = ctx['global'].getArray(mtev, 'xPositions') yPositions = ctx['global'].getArray(mtev, 'yPositions') @@ -346,22 +343,22 @@ for i in range(0, mtev.contactCount): - print(" [%d] %d,%d %d %d" % (i, xPositions[i], yPositions[i], contactIds[i], contactFlags[i])) + print " [%d] %d,%d %d %d" % (i, xPositions[i], yPositions[i], contactIds[i], contactFlags[i]) def monitorSource(ctx, eventSource, active, dur): def handleEventImpl(event): evtype = event.type - print("got event: %s %s" % (str(evtype), asEnumElem(ctx, 'VBoxEventType', evtype))) + print "got event: %s %s" % (str(evtype), asEnumElem(ctx, 'VBoxEventType', evtype)) if evtype == ctx['global'].constants.VBoxEventType_OnMachineStateChanged: scev = ctx['global'].queryInterface(event, 'IMachineStateChangedEvent') if scev: - print("machine state event: mach=%s state=%s" % (scev.machineId, scev.state)) + print "machine state event: mach=%s state=%s" % (scev.machineId, scev.state) elif evtype == ctx['global'].constants.VBoxEventType_OnSnapshotTaken: stev = ctx['global'].queryInterface(event, 'ISnapshotTakenEvent') if stev: - print("snapshot taken event: mach=%s snap=%s" % (stev.machineId, stev.snapshotId)) + print "snapshot taken event: mach=%s snap=%s" % (stev.machineId, stev.snapshotId) elif evtype == ctx['global'].constants.VBoxEventType_OnGuestPropertyChanged: gpcev = ctx['global'].queryInterface(event, 'IGuestPropertyChangedEvent') if gpcev: - print("guest property change: name=%s value=%s" % (gpcev.name, gpcev.value)) + print "guest property change: name=%s value=%s" % (gpcev.name, gpcev.value) elif evtype == ctx['global'].constants.VBoxEventType_OnMousePointerShapeChanged: psev = ctx['global'].queryInterface(event, 'IMousePointerShapeChangedEvent') @@ -369,7 +366,7 @@ shape = ctx['global'].getArray(psev, 'shape') if shape is None: - print("pointer shape event - empty shape") + print "pointer shape event - empty shape" else: - print("pointer shape event: w=%d h=%d shape len=%d" % (psev.width, psev.height, len(shape))) + print "pointer shape event: w=%d h=%d shape len=%d" % (psev.width, psev.height, len(shape)) elif evtype == ctx['global'].constants.VBoxEventType_OnGuestMouse: mev = ctx['global'].queryInterface(event, 'IGuestMouseEvent') @@ -444,5 +441,5 @@ def handleEventImpl(event): evtype = event.type - #print("got event: %s %s" % (str(evtype), asEnumElem(ctx, 'VBoxEventType', evtype))) + #print "got event: %s %s" % (str(evtype), asEnumElem(ctx, 'VBoxEventType', evtype)) if evtype == ctx['global'].constants.VBoxEventType_OnGuestMouse: mev = ctx['global'].queryInterface(event, 'IGuestMouseEvent') @@ -492,5 +489,5 @@ header = demo.readline() - print("Header is", header) + print "Header is", header basere = re.compile(r'(?P\d+): (?P[km]) (?P

.*)') mre = re.compile(r'(?P\d+) (?P-*\d+) (?P-*\d+) (?P-*\d+) (?P-*\d+) (?P-*\d+)') @@ -518,5 +515,5 @@ if rtype == 'k': codes = kre.findall(params) - #print("KBD:", codes) + #print "KBD:", codes kbd.putScancodes(codes) elif rtype == 'm': @@ -526,8 +523,8 @@ if mdict['a'] == '1': # absolute - #print("MA: ", mdict['x'], mdict['y'], mdict['z'], mdict['b']) + #print "MA: ", mdict['x'], mdict['y'], mdict['z'], mdict['b'] mouse.putMouseEventAbsolute(int(mdict['x']), int(mdict['y']), int(mdict['z']), int(mdict['w']), int(mdict['b'])) else: - #print("MR: ", mdict['x'], mdict['y'], mdict['b']) + #print "MR: ", mdict['x'], mdict['y'], mdict['b'] mouse.putMouseEvent(int(mdict['x']), int(mdict['y']), int(mdict['z']), int(mdict['w']), int(mdict['b'])) @@ -562,5 +559,5 @@ h = fbh - print("Saving screenshot (%d x %d) screen %d in %s..." % (w, h, screen, f)) + print "Saving screenshot (%d x %d) screen %d in %s..." % (w, h, screen, f) data = display.takeScreenShotToArray(screen, w, h, ctx['const'].BitmapFormat_RGBA) size = (w, h) @@ -589,5 +586,5 @@ h = fbh - print("Saving screenshot (%d x %d) screen %d in %s..." % (w, h, screen, f)) + print "Saving screenshot (%d x %d) screen %d in %s..." % (w, h, screen, f) data = display.takeScreenShotToArray(screen, w, h, ctx['const'].BitmapFormat_PNG) pngfile = open(f, 'wb') @@ -597,5 +594,5 @@ def teleport(ctx, _session, console, args): if args[0].find(":") == -1: - print("Use host:port format for teleport target") + print "Use host:port format for teleport target" return (host, port) = args[0].split(":") @@ -611,8 +608,8 @@ port = int(port) - print("Teleporting to %s:%d..." % (host, port)) + print "Teleporting to %s:%d..." % (host, port) progress = console.teleport(host, port, passwd, maxDowntime) if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0: - print("Success!") + print "Success!" else: reportError(ctx, progress) @@ -635,8 +632,8 @@ all_stats = ctx['const'].all_values('GuestStatisticType') cpu = 0 - for s in list(all_stats.keys()): + for s in all_stats.keys(): try: val = guest.getStatistic( cpu, all_stats[s]) - print("%s: %d" % (s, val)) + print "%s: %d" % (s, val) except: # likely not implemented @@ -645,10 +642,10 @@ def plugCpu(_ctx, machine, _session, args): cpu = int(args[0]) - print("Adding CPU %d..." % (cpu)) + print "Adding CPU %d..." % (cpu) machine.hotPlugCPU(cpu) def unplugCpu(_ctx, machine, _session, args): cpu = int(args[0]) - print("Removing CPU %d..." % (cpu)) + print "Removing CPU %d..." % (cpu) machine.hotUnplugCPU(cpu) @@ -664,31 +661,31 @@ def printHostUsbDev(ctx, ud): - print(" %s: %s (vendorId=%d productId=%d serial=%s) %s" % (ud.id, colored(ud.product, 'blue'), ud.vendorId, ud.productId, ud.serialNumber, asEnumElem(ctx, 'USBDeviceState', ud.state))) + print " %s: %s (vendorId=%d productId=%d serial=%s) %s" % (ud.id, colored(ud.product, 'blue'), ud.vendorId, ud.productId, ud.serialNumber, asEnumElem(ctx, 'USBDeviceState', ud.state)) def printUsbDev(_ctx, ud): - print(" %s: %s (vendorId=%d productId=%d serial=%s)" % (ud.id, colored(ud.product, 'blue'), ud.vendorId, ud.productId, ud.serialNumber)) + print " %s: %s (vendorId=%d productId=%d serial=%s)" % (ud.id, colored(ud.product, 'blue'), ud.vendorId, ud.productId, ud.serialNumber) def printSf(ctx, sf): - print(" name=%s host=%s %s %s" % (sf.name, colPath(ctx, sf.hostPath), cond(sf.accessible, "accessible", "not accessible"), cond(sf.writable, "writable", "read-only"))) + print " name=%s host=%s %s %s" % (sf.name, colPath(ctx, sf.hostPath), cond(sf.accessible, "accessible", "not accessible"), cond(sf.writable, "writable", "read-only")) def ginfo(ctx, console, _args): guest = console.guest if guest.additionsRunLevel != ctx['const'].AdditionsRunLevelType_None: - print("Additions active, version %s" % (guest.additionsVersion)) - print("Support seamless: %s" % (getFacilityStatus(ctx, guest, ctx['const'].AdditionsFacilityType_Seamless))) - print("Support graphics: %s" % (getFacilityStatus(ctx, guest, ctx['const'].AdditionsFacilityType_Graphics))) - print("Balloon size: %d" % (guest.memoryBalloonSize)) - print("Statistic update interval: %d" % (guest.statisticsUpdateInterval)) - else: - print("No additions") + print "Additions active, version %s" % (guest.additionsVersion) + print "Support seamless: %s" % (getFacilityStatus(ctx, guest, ctx['const'].AdditionsFacilityType_Seamless)) + print "Support graphics: %s" % (getFacilityStatus(ctx, guest, ctx['const'].AdditionsFacilityType_Graphics)) + print "Balloon size: %d" % (guest.memoryBalloonSize) + print "Statistic update interval: %d" % (guest.statisticsUpdateInterval) + else: + print "No additions" usbs = ctx['global'].getArray(console, 'USBDevices') - print("Attached USB:") + print "Attached USB:" for ud in usbs: printUsbDev(ctx, ud) rusbs = ctx['global'].getArray(console, 'remoteUSBDevices') - print("Remote USB:") + print "Remote USB:" for ud in rusbs: printHostUsbDev(ctx, ud) - print("Transient shared folders:") + print "Transient shared folders:" sfs = rusbs = ctx['global'].getArray(console, 'sharedFolders') for sf in sfs: @@ -701,5 +698,5 @@ session = ctx['global'].getSessionObject(vbox) mach.lockMachine(session, ctx['global'].constants.LockType_Shared) - except Exception as e: + except Exception, e: printErr(ctx, "Session to '%s' not open: %s" % (mach.name, str(e))) if g_fVerbose: @@ -707,5 +704,5 @@ return if session.state != ctx['const'].SessionState_Locked: - print("Session to '%s' in wrong state: %s" % (mach.name, session.state)) + print "Session to '%s' in wrong state: %s" % (mach.name, session.state) session.unlockMachine() return @@ -713,5 +710,5 @@ # in Webservices) functionality if ctx['remote'] and cmd == 'some_local_only_command': - print('Trying to use local only functionality, ignored') + print 'Trying to use local only functionality, ignored' session.unlockMachine() return @@ -737,5 +734,5 @@ except KeyboardInterrupt: ctx['interrupt'] = True - except Exception as e: + except Exception, e: printErr(ctx, e) if g_fVerbose: @@ -750,5 +747,5 @@ try: cmd(ctx, mach, args) - except Exception as e: + except Exception, e: save = False printErr(ctx, e) @@ -758,5 +755,5 @@ try: mach.saveSettings() - except Exception as e: + except Exception, e: printErr(ctx, e) if g_fVerbose: @@ -770,5 +767,5 @@ try: cmd(ctx, mach, session.console, args) - except Exception as e: + except Exception, e: save = False printErr(ctx, e) @@ -780,5 +777,8 @@ def machById(ctx, uuid): - mach = ctx['vb'].findMachine(uuid) + try: + mach = ctx['vb'].getMachine(uuid) + except: + mach = ctx['vb'].findMachine(uuid) return mach @@ -899,10 +899,10 @@ def argsToMach(ctx, args): if len(args) < 2: - print("usage: %s [vmname|uuid]" % (args[0])) + print "usage: %s [vmname|uuid]" % (args[0]) return None uuid = args[1] mach = machById(ctx, uuid) if mach == None: - print("Machine '%s' is unknown, use list command to find available machines" % (uuid)) + print "Machine '%s' is unknown, use list command to find available machines" % (uuid) return mach @@ -912,10 +912,10 @@ else: spec = "" - print(" %s: %s%s" % (colored(cmd, 'blue'), h, spec)) + print " %s: %s%s" % (colored(cmd, 'blue'), h, spec) def helpCmd(_ctx, args): if len(args) == 1: - print("Help page:") - names = list(commands.keys()) + print "Help page:" + names = commands.keys() names.sort() for i in names: @@ -925,5 +925,5 @@ c = commands.get(cmd) if c == None: - print("Command '%s' not known" % (cmd)) + print "Command '%s' not known" % (cmd) else: helpSingleCmd(cmd, c[0], c[2]) @@ -932,5 +932,5 @@ def asEnumElem(ctx, enum, elem): enumVals = ctx['const'].all_values(enum) - for e in list(enumVals.keys()): + for e in enumVals.keys(): if str(elem) == str(enumVals[e]): return colored(e, 'green') @@ -948,6 +948,6 @@ else: tele = " " - print("%sMachine '%s' [%s], machineState=%s, sessionState=%s" % (tele, colVm(ctx, mach.name), mach.id, asEnumElem(ctx, "MachineState", mach.state), asEnumElem(ctx, "SessionState", mach.sessionState))) - except Exception as e: + print "%sMachine '%s' [%s], machineState=%s, sessionState=%s" % (tele, colVm(ctx, mach.name), mach.id, asEnumElem(ctx, "MachineState", mach.state), asEnumElem(ctx, "SessionState", mach.sessionState)) + except Exception, e: printErr(ctx, e) if g_fVerbose: @@ -956,6 +956,6 @@ def infoCmd(ctx, args): - if len(args) < 2: - print("usage: info [vmname|uuid]") + if (len(args) < 2): + print "usage: info [vmname|uuid]" return 0 mach = argsToMach(ctx, args) @@ -963,109 +963,109 @@ return 0 vmos = ctx['vb'].getGuestOSType(mach.OSTypeId) - print(" One can use setvar to change variable, using name in [].") - print(" Name [name]: %s" % (colVm(ctx, mach.name))) - print(" Description [description]: %s" % (mach.description)) - print(" ID [n/a]: %s" % (mach.id)) - print(" OS Type [via OSTypeId]: %s" % (vmos.description)) - print(" Firmware [firmwareType]: %s (%s)" % (asEnumElem(ctx, "FirmwareType", mach.firmwareType), mach.firmwareType)) - print() - 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(" Chipset [chipsetType]: %s (%s)" % (asEnumElem(ctx, "ChipsetType", mach.chipsetType), mach.chipsetType)) - print() - print(" Clipboard mode [clipboardMode]: %s (%s)" % (asEnumElem(ctx, "ClipboardMode", mach.clipboardMode), mach.clipboardMode)) - print(" Machine status [n/a]: %s (%s)" % (asEnumElem(ctx, "SessionState", mach.sessionState), mach.sessionState)) - print() + print " One can use setvar to change variable, using name in []." + print " Name [name]: %s" % (colVm(ctx, mach.name)) + print " Description [description]: %s" % (mach.description) + print " ID [n/a]: %s" % (mach.id) + print " OS Type [via OSTypeId]: %s" % (vmos.description) + print " Firmware [firmwareType]: %s (%s)" % (asEnumElem(ctx, "FirmwareType", mach.firmwareType), mach.firmwareType) + print + 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 " Chipset [chipsetType]: %s (%s)" % (asEnumElem(ctx, "ChipsetType", mach.chipsetType), mach.chipsetType) + print + print " Clipboard mode [clipboardMode]: %s (%s)" % (asEnumElem(ctx, "ClipboardMode", mach.clipboardMode), mach.clipboardMode) + print " Machine status [n/a]: %s (%s)" % (asEnumElem(ctx, "SessionState", mach.sessionState), mach.sessionState) + print if mach.teleporterEnabled: - print(" Teleport target on port %d (%s)" % (mach.teleporterPort, mach.teleporterPassword)) - print() + print " Teleport target on port %d (%s)" % (mach.teleporterPort, mach.teleporterPassword) + print bios = mach.BIOSSettings - print(" ACPI [BIOSSettings.ACPIEnabled]: %s" % (asState(bios.ACPIEnabled))) - print(" APIC [BIOSSettings.IOAPICEnabled]: %s" % (asState(bios.IOAPICEnabled))) + print " ACPI [BIOSSettings.ACPIEnabled]: %s" % (asState(bios.ACPIEnabled)) + print " APIC [BIOSSettings.IOAPICEnabled]: %s" % (asState(bios.IOAPICEnabled)) hwVirtEnabled = mach.getHWVirtExProperty(ctx['global'].constants.HWVirtExPropertyType_Enabled) - print(" Hardware virtualization [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_Enabled, value)]: " + asState(hwVirtEnabled)) + print " Hardware virtualization [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_Enabled, value)]: " + asState(hwVirtEnabled) hwVirtVPID = mach.getHWVirtExProperty(ctx['const'].HWVirtExPropertyType_VPID) - print(" VPID support [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_VPID, value)]: " + asState(hwVirtVPID)) + print " VPID support [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_VPID, value)]: " + asState(hwVirtVPID) hwVirtNestedPaging = mach.getHWVirtExProperty(ctx['const'].HWVirtExPropertyType_NestedPaging) - print(" Nested paging [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_NestedPaging, value)]: " + asState(hwVirtNestedPaging)) - - print(" Hardware 3d acceleration [accelerate3DEnabled]: " + asState(mach.accelerate3DEnabled)) - print(" Hardware 2d video acceleration [accelerate2DVideoEnabled]: " + asState(mach.accelerate2DVideoEnabled)) - - print(" Use universal time [RTCUseUTC]: %s" % (asState(mach.RTCUseUTC))) - print(" HPET [HPETEnabled]: %s" % (asState(mach.HPETEnabled))) + print " Nested paging [guest win machine.setHWVirtExProperty(ctx[\\'const\\'].HWVirtExPropertyType_NestedPaging, value)]: " + asState(hwVirtNestedPaging) + + print " Hardware 3d acceleration [accelerate3DEnabled]: " + asState(mach.accelerate3DEnabled) + print " Hardware 2d video acceleration [accelerate2DVideoEnabled]: " + asState(mach.accelerate2DVideoEnabled) + + print " Use universal time [RTCUseUTC]: %s" % (asState(mach.RTCUseUTC)) + 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))) - - print(" Keyboard [keyboardHIDType]: %s (%s)" % (asEnumElem(ctx, "KeyboardHIDType", mach.keyboardHIDType), mach.keyboardHIDType)) - print(" Pointing device [pointingHIDType]: %s (%s)" % (asEnumElem(ctx, "PointingHIDType", mach.pointingHIDType), mach.pointingHIDType)) - print(" Last changed [n/a]: " + time.asctime(time.localtime(mach.lastStateChange/1000))) + 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)) + + print " Keyboard [keyboardHIDType]: %s (%s)" % (asEnumElem(ctx, "KeyboardHIDType", mach.keyboardHIDType), mach.keyboardHIDType) + print " Pointing device [pointingHIDType]: %s (%s)" % (asEnumElem(ctx, "PointingHIDType", mach.pointingHIDType), mach.pointingHIDType) + print " Last changed [n/a]: " + time.asctime(time.localtime(long(mach.lastStateChange)/1000)) # OSE has no VRDE try: - print(" VRDE server [VRDEServer.enabled]: %s" % (asState(mach.VRDEServer.enabled))) + print " VRDE server [VRDEServer.enabled]: %s" % (asState(mach.VRDEServer.enabled)) except: pass - print() - print(colCat(ctx, " USB Controllers:")) + print + print colCat(ctx, " USB Controllers:") for oUsbCtrl in ctx['global'].getArray(mach, 'USBControllers'): - print(" '%s': type %s standard: %#x" \ - % (oUsbCtrl.name, asEnumElem(ctx, "USBControllerType", oUsbCtrl.type), oUsbCtrl.USBStandard)) - - print() - print(colCat(ctx, " I/O subsystem info:")) - print(" Cache enabled [IOCacheEnabled]: %s" % (asState(mach.IOCacheEnabled))) - print(" Cache size [IOCacheSize]: %dM" % (mach.IOCacheSize)) + print " '%s': type %s standard: %#x" \ + % (oUsbCtrl.name, asEnumElem(ctx, "USBControllerType", oUsbCtrl.type), oUsbCtrl.USBStandard); + + print + print colCat(ctx, " I/O subsystem info:") + print " Cache enabled [IOCacheEnabled]: %s" % (asState(mach.IOCacheEnabled)) + print " Cache size [IOCacheSize]: %dM" % (mach.IOCacheSize) controllers = ctx['global'].getArray(mach, 'storageControllers') if controllers: - print() - print(colCat(ctx, " Storage Controllers:")) + print + print colCat(ctx, " Storage Controllers:") for controller in controllers: - print(" '%s': bus %s type %s" % (controller.name, asEnumElem(ctx, "StorageBus", controller.bus), asEnumElem(ctx, "StorageControllerType", controller.controllerType))) + print " '%s': bus %s type %s" % (controller.name, asEnumElem(ctx, "StorageBus", controller.bus), asEnumElem(ctx, "StorageControllerType", controller.controllerType)) attaches = ctx['global'].getArray(mach, 'mediumAttachments') if attaches: - print() - print(colCat(ctx, " Media:")) + print + print colCat(ctx, " Media:") for a in attaches: - print(" Controller: '%s' port/device: %d:%d type: %s (%s):" % (a.controller, a.port, a.device, asEnumElem(ctx, "DeviceType", a.type), a.type)) + print " Controller: '%s' port/device: %d:%d type: %s (%s):" % (a.controller, a.port, a.device, asEnumElem(ctx, "DeviceType", a.type), a.type) medium = a.medium if a.type == ctx['global'].constants.DeviceType_HardDisk: - print(" HDD:") - print(" Id: %s" % (medium.id)) - print(" Location: %s" % (colPath(ctx, medium.location))) - print(" Name: %s" % (medium.name)) - print(" Format: %s" % (medium.format)) + print " HDD:" + print " Id: %s" % (medium.id) + print " Location: %s" % (colPath(ctx, medium.location)) + print " Name: %s" % (medium.name) + print " Format: %s" % (medium.format) if a.type == ctx['global'].constants.DeviceType_DVD: - print(" DVD:") + print " DVD:" if medium: - print(" Id: %s" % (medium.id)) - print(" Name: %s" % (medium.name)) + print " Id: %s" % (medium.id) + print " Name: %s" % (medium.name) if medium.hostDrive: - print(" Host DVD %s" % (colPath(ctx, medium.location))) + print " Host DVD %s" % (colPath(ctx, medium.location)) if a.passthrough: - print(" [passthrough mode]") + print " [passthrough mode]" else: - print(" Virtual image at %s" % (colPath(ctx, medium.location))) - print(" Size: %s" % (medium.size)) + print " Virtual image at %s" % (colPath(ctx, medium.location)) + print " Size: %s" % (medium.size) if a.type == ctx['global'].constants.DeviceType_Floppy: - print(" Floppy:") + print " Floppy:" if medium: - print(" Id: %s" % (medium.id)) - print(" Name: %s" % (medium.name)) + print " Id: %s" % (medium.id) + print " Name: %s" % (medium.name) if medium.hostDrive: - print(" Host floppy %s" % (colPath(ctx, medium.location))) + print " Host floppy %s" % (colPath(ctx, medium.location)) else: - print(" Virtual image at %s" % (colPath(ctx, medium.location))) - print(" Size: %s" % (medium.size)) - - print() - print(colCat(ctx, " Shared folders:")) + print " Virtual image at %s" % (colPath(ctx, medium.location)) + print " Size: %s" % (medium.size) + + print + print colCat(ctx, " Shared folders:") for sf in ctx['global'].getArray(mach, 'sharedFolders'): printSf(ctx, sf) @@ -1075,5 +1075,5 @@ def startCmd(ctx, args): if len(args) < 2: - print("usage: start name ") + print "usage: start name " return 0 mach = argsToMach(ctx, args) @@ -1088,6 +1088,6 @@ def createVmCmd(ctx, args): - if len(args) != 3: - print("usage: createvm name ostype") + if (len(args) != 3): + print "usage: createvm name ostype" return 0 name = args[1] @@ -1096,5 +1096,5 @@ ctx['vb'].getGuestOSType(oskind) except Exception: - print('Unknown OS type:', oskind) + print 'Unknown OS type:', oskind return 0 createVm(ctx, name, oskind) @@ -1102,6 +1102,6 @@ def ginfoCmd(ctx, args): - if len(args) < 2: - print("usage: ginfo [vmname|uuid]") + if (len(args) < 2): + print "usage: ginfo [vmname|uuid]" return 0 mach = argsToMach(ctx, args) @@ -1113,5 +1113,5 @@ def execInGuest(ctx, console, args, env, user, passwd, tmo, inputPipe=None, outputPipe=None): if len(args) < 1: - print("exec in guest needs at least program name") + print "exec in guest needs at least program name" return guest = console.guest @@ -1119,11 +1119,11 @@ # shall contain program name as argv[0] gargs = args - print("executing %s with args %s as %s" % (args[0], gargs, user)) + print "executing %s with args %s as %s" % (args[0], gargs, user) flags = 0 if inputPipe is not None: flags = 1 # set WaitForProcessStartOnly - print(args[0]) + print args[0] process = guestSession.processCreate(args[0], gargs, env, [], tmo) - print("executed with pid %d" % (process.PID)) + print "executed with pid %d" % (process.PID) if pid != 0: try: @@ -1161,10 +1161,10 @@ except KeyboardInterrupt: - print("Interrupted.") + print "Interrupted." ctx['interrupt'] = True if progress.cancelable: progress.cancel() (_reason, code, _flags) = guest.getProcessStatus(pid) - print("Exit code: %d" % (code)) + print "Exit code: %d" % (code) return 0 else: @@ -1175,5 +1175,5 @@ dst = args[1] flags = 0 - print("Copying host %s to guest %s" % (src, dst)) + print "Copying host %s to guest %s" % (src, dst) progress = console.guest.copyToGuest(src, dst, user, passwd, flags) progressBar(ctx, progress) @@ -1196,5 +1196,5 @@ user = getpass.getuser() user_inp = nh_raw_input("User (%s): " % (user)) - if len(user_inp) > 0: + if len (user_inp) > 0: user = user_inp passwd = getpass.getpass() @@ -1203,6 +1203,6 @@ def gexecCmd(ctx, args): - if len(args) < 2: - print("usage: gexec [vmname|uuid] command args") + if (len(args) < 2): + print "usage: gexec [vmname|uuid] command args" return 0 mach = argsToMach(ctx, args) @@ -1217,6 +1217,6 @@ def gcopyCmd(ctx, args): - if len(args) < 2: - print("usage: gcopy [vmname|uuid] host_path guest_path") + if (len(args) < 2): + print "usage: gcopy [vmname|uuid] host_path guest_path" return 0 mach = argsToMach(ctx, args) @@ -1236,6 +1236,6 @@ def gpipeCmd(ctx, args): - if len(args) < 4: - print("usage: gpipe [vmname|uuid] hostProgram guestProgram, such as gpipe linux '/bin/uname -a' '/bin/sh -c \"/usr/bin/tee; /bin/uname -a\"'") + if (len(args) < 4): + print "usage: gpipe [vmname|uuid] hostProgram guestProgram, such as gpipe linux '/bin/uname -a' '/bin/sh -c \"/usr/bin/tee; /bin/uname -a\"'" return 0 mach = argsToMach(ctx, args) @@ -1309,6 +1309,6 @@ def guestCmd(ctx, args): - if len(args) < 3: - print("usage: guest name commands") + if (len(args) < 3): + print "usage: guest name commands" return 0 mach = argsToMach(ctx, args) @@ -1322,6 +1322,6 @@ def screenshotCmd(ctx, args): - if len(args) < 2: - print("usage: screenshot vm ") + if (len(args) < 2): + print "usage: screenshot vm " return 0 mach = argsToMach(ctx, args) @@ -1332,6 +1332,6 @@ def teleportCmd(ctx, args): - if len(args) < 3: - print("usage: teleport name host:port ") + if (len(args) < 3): + print "usage: teleport name host:port " return 0 mach = argsToMach(ctx, args) @@ -1351,6 +1351,6 @@ def openportalCmd(ctx, args): - if len(args) < 3: - print("usage: openportal name port ") + if (len(args) < 3): + print "usage: openportal name port " return 0 mach = argsToMach(ctx, args) @@ -1358,5 +1358,5 @@ return 0 port = int(args[2]) - if len(args) > 3: + if (len(args) > 3): passwd = args[3] else: @@ -1368,6 +1368,6 @@ def closeportalCmd(ctx, args): - if len(args) < 2: - print("usage: closeportal name") + if (len(args) < 2): + print "usage: closeportal name" return 0 mach = argsToMach(ctx, args) @@ -1379,6 +1379,6 @@ def gueststatsCmd(ctx, args): - if len(args) < 2: - print("usage: gueststats name ") + if (len(args) < 2): + print "usage: gueststats name " return 0 mach = argsToMach(ctx, args) @@ -1392,13 +1392,13 @@ cpu = args[1] if plug: - print("Adding CPU %d..." % (cpu)) + print "Adding CPU %d..." % (cpu) mach.hotPlugCPU(cpu) else: - print("Removing CPU %d..." % (cpu)) + print "Removing CPU %d..." % (cpu) mach.hotUnplugCPU(cpu) def plugcpuCmd(ctx, args): - if len(args) < 2: - print("usage: plugcpu name cpuid") + if (len(args) < 2): + print "usage: plugcpu name cpuid" return 0 mach = argsToMach(ctx, args) @@ -1413,6 +1413,6 @@ def unplugcpuCmd(ctx, args): - if len(args) < 2: - print("usage: unplugcpu name cpuid") + if (len(args) < 2): + print "usage: unplugcpu name cpuid" return 0 mach = argsToMach(ctx, args) @@ -1428,10 +1428,10 @@ def setvar(_ctx, _mach, args): expr = 'mach.'+args[0]+' = '+args[1] - print("Executing", expr) - exec(expr) + print "Executing", expr + exec expr def setvarCmd(ctx, args): - if len(args) < 4: - print("usage: setvar [vmname|uuid] expr value") + if (len(args) < 4): + print "usage: setvar [vmname|uuid] expr value" return 0 mach = argsToMach(ctx, args) @@ -1444,10 +1444,10 @@ key = args[0] value = args[1] - print("%s: setting %s to %s" % (mach.name, key, value if value else None)) + print "%s: setting %s to %s" % (mach.name, key, value if value else None) mach.setExtraData(key, value) def setExtraDataCmd(ctx, args): - if len(args) < 3: - print("usage: setextra [vmname|uuid|global] key ") + if (len(args) < 3): + print "usage: setextra [vmname|uuid|global] key " return 0 key = args[2] @@ -1467,9 +1467,9 @@ def printExtraKey(obj, key, value): - print("%s: '%s' = '%s'" % (obj, key, value)) + print "%s: '%s' = '%s'" % (obj, key, value) def getExtraDataCmd(ctx, args): - if len(args) < 2: - print("usage: getextra [vmname|uuid|global] ") + if (len(args) < 2): + print "usage: getextra [vmname|uuid|global] " return 0 if len(args) == 3: @@ -1498,15 +1498,15 @@ def aliasCmd(ctx, args): - if len(args) == 3: + if (len(args) == 3): aliases[args[1]] = args[2] return 0 - for (key, value) in list(aliases.items()): - print("'%s' is an alias for '%s'" % (key, value)) + for (key, value) in aliases.items(): + print "'%s' is an alias for '%s'" % (key, value) return 0 def verboseCmd(ctx, args): global g_fVerbose - if len(args) > 1: + if (len(args) > 1): g_fVerbose = (args[1]=='on') else: @@ -1516,5 +1516,5 @@ def colorsCmd(ctx, args): global g_fHasColors - if len(args) > 1: + if (len(args) > 1): g_fHasColors = (args[1] == 'on') else: @@ -1525,44 +1525,44 @@ vbox = ctx['vb'] try: - print("VirtualBox version %s" % (colored(vbox.version, 'blue'))) - except Exception as e: + print "VirtualBox version %s" % (colored(vbox.version, 'blue')) + except Exception, e: printErr(ctx, e) if g_fVerbose: traceback.print_exc() props = vbox.systemProperties - print("Machines: %s" % (colPath(ctx, props.defaultMachineFolder))) - - #print("Global shared folders:") + print "Machines: %s" % (colPath(ctx, props.defaultMachineFolder)) + + #print "Global shared folders:" #for ud in ctx['global'].getArray(vbox, 'sharedFolders'): # printSf(ctx, sf) host = vbox.host cnt = host.processorCount - print(colCat(ctx, "Processors:")) - print(" available/online: %d/%d " % (cnt, host.processorOnlineCount)) + print colCat(ctx, "Processors:") + print " available/online: %d/%d " % (cnt, host.processorOnlineCount) for i in range(0, cnt): - print(" processor #%d speed: %dMHz %s" % (i, host.getProcessorSpeed(i), host.getProcessorDescription(i))) - - print(colCat(ctx, "RAM:")) - print(" %dM (free %dM)" % (host.memorySize, host.memoryAvailable)) - print(colCat(ctx, "OS:")) - print(" %s (%s)" % (host.operatingSystem, host.OSVersion)) + print " processor #%d speed: %dMHz %s" % (i, host.getProcessorSpeed(i), host.getProcessorDescription(i)) + + print colCat(ctx, "RAM:") + print " %dM (free %dM)" % (host.memorySize, host.memoryAvailable) + print colCat(ctx, "OS:") + print " %s (%s)" % (host.operatingSystem, host.OSVersion) if host.acceleration3DAvailable: - print(colCat(ctx, "3D acceleration available")) - else: - print(colCat(ctx, "3D acceleration NOT available")) - - print(colCat(ctx, "Network interfaces:")) + print colCat(ctx, "3D acceleration available") + else: + print colCat(ctx, "3D acceleration NOT available") + + print colCat(ctx, "Network interfaces:") for ni in ctx['global'].getArray(host, 'networkInterfaces'): - print(" %s (%s)" % (ni.name, ni.IPAddress)) - - print(colCat(ctx, "DVD drives:")) + print " %s (%s)" % (ni.name, ni.IPAddress) + + print colCat(ctx, "DVD drives:") for dd in ctx['global'].getArray(host, 'DVDDrives'): - print(" %s - %s" % (dd.name, dd.description)) - - print(colCat(ctx, "Floppy drives:")) + print " %s - %s" % (dd.name, dd.description) + + print colCat(ctx, "Floppy drives:") for dd in ctx['global'].getArray(host, 'floppyDrives'): - print(" %s - %s" % (dd.name, dd.description)) - - print(colCat(ctx, "USB devices:")) + print " %s - %s" % (dd.name, dd.description) + + print colCat(ctx, "USB devices:") for ud in ctx['global'].getArray(host, 'USBDevices'): printHostUsbDev(ctx, ud) @@ -1570,11 +1570,11 @@ if ctx['perf']: for metric in ctx['perf'].query(["*"], [host]): - print(metric['name'], metric['values_as_string']) + print metric['name'], metric['values_as_string'] return 0 def monitorGuestCmd(ctx, args): - if len(args) < 2: - print("usage: monitorGuest name (duration)") + if (len(args) < 2): + print "usage: monitorGuest name (duration)" return 0 mach = argsToMach(ctx, args) @@ -1589,6 +1589,6 @@ def monitorGuestKbdCmd(ctx, args): - if len(args) < 2: - print("usage: monitorGuestKbd name (duration)") + if (len(args) < 2): + print "usage: monitorGuestKbd name (duration)" return 0 mach = argsToMach(ctx, args) @@ -1603,6 +1603,6 @@ def monitorGuestMouseCmd(ctx, args): - if len(args) < 2: - print("usage: monitorGuestMouse name (duration)") + if (len(args) < 2): + print "usage: monitorGuestMouse name (duration)" return 0 mach = argsToMach(ctx, args) @@ -1617,6 +1617,6 @@ def monitorGuestMultiTouchCmd(ctx, args): - if len(args) < 2: - print("usage: monitorGuestMultiTouch name (duration)") + if (len(args) < 2): + print "usage: monitorGuestMultiTouch name (duration)" return 0 mach = argsToMach(ctx, args) @@ -1631,6 +1631,6 @@ def monitorVBoxCmd(ctx, args): - if len(args) > 2: - print("usage: monitorVBox (duration)") + if (len(args) > 2): + print "usage: monitorVBox (duration)" return 0 dur = 5 @@ -1659,6 +1659,6 @@ def portForwardCmd(ctx, args): - if len(args) != 5: - print("usage: portForward ") + if (len(args) != 5): + print "usage: portForward " return 0 mach = argsToMach(ctx, args) @@ -1690,6 +1690,6 @@ def showLogCmd(ctx, args): - if len(args) < 2: - print("usage: showLog vm ") + if (len(args) < 2): + print "usage: showLog vm " return 0 mach = argsToMach(ctx, args) @@ -1698,5 +1698,5 @@ log = 0 - if len(args) > 2: + if (len(args) > 2): log = args[2] @@ -1704,5 +1704,5 @@ while True: data = mach.readLog(log, uOffset, 4096) - if len(data) == 0: + if (len(data) == 0): break # print adds either NL or space to chunks not ending with a NL @@ -1713,6 +1713,6 @@ def findLogCmd(ctx, args): - if len(args) < 3: - print("usage: findLog vm pattern ") + if (len(args) < 3): + print "usage: findLog vm pattern " return 0 mach = argsToMach(ctx, args) @@ -1721,5 +1721,5 @@ log = 0 - if len(args) > 3: + if (len(args) > 3): log = args[3] @@ -1729,5 +1729,5 @@ # to reduce line splits on buffer boundary data = mach.readLog(log, uOffset, 512*1024) - if len(data) == 0: + if (len(data) == 0): break d = str(data).split("\n") @@ -1737,5 +1737,5 @@ for mt in match: s = s.replace(mt, colored(mt, 'red')) - print(s) + print s uOffset += len(data) @@ -1744,6 +1744,6 @@ def findAssertCmd(ctx, args): - if len(args) < 2: - print("usage: findAssert vm ") + if (len(args) < 2): + print "usage: findAssert vm " return 0 mach = argsToMach(ctx, args) @@ -1752,5 +1752,5 @@ log = 0 - if len(args) > 2: + if (len(args) > 2): log = args[2] @@ -1762,10 +1762,10 @@ # to reduce line splits on buffer boundary data = mach.readLog(log, uOffset, 512*1024) - if len(data) == 0: + if (len(data) == 0): break d = str(data).split("\n") for s in d: if active: - print(s) + print s if context == 0: active = False @@ -1777,5 +1777,5 @@ active = True context = 50 - print(s) + print s uOffset += len(data) @@ -1785,6 +1785,6 @@ expr = ' '.join(args[1:]) try: - exec(expr) - except Exception as e: + exec expr + except Exception, e: printErr(ctx, e) if g_fVerbose: @@ -1799,11 +1799,11 @@ def runScriptCmd(ctx, args): - if len(args) != 2: - print("usage: runScript