Changeset 28631 in vbox

Timestamp:

Apr 23, 2010 8:57:19 AM (15 years ago)

Author:

vboxsync

Message:

vbox shell: usb control, cancellation

File:

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

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

@@ -225 +225 @@
             p.waitForCompletion(wait)
             ctx['global'].waitForEvents(0)
+        return 0
     except KeyboardInterrupt:
         print "Interrupted."
+        if p.cancelable:
+            print "Canceling task..."
+            p.cancel()
+        return 1
+        
 
 
@@ -439 +445 @@
     machine.saveSettings()
 
+def cond(c,v1,v2):
+    if c:
+        return v1
+    else:
+        return v2
+
+def printHostUsbDev(ctx,ud):
+    print "  %s: %s (vendorId=%d productId=%d serial=%s) %s" %(ud.id, ud.product, ud.vendorId, ud.productId, ud.serialNumber,getUSBStateString(ud.state))
+
+def printUsbDev(ctx,ud):
+    print "  %s: %s (vendorId=%d productId=%d serial=%s)" %(ud.id, ud.product, ud.vendorId, ud.productId, ud.serialNumber)
+
+def printSf(ctx,sf):
+    print "name=%s host=%s %s %s" %(sf.name, sf.hostPath, cond(sf.accessible, "accessible", "not accessible"), cond(sf.writable, "writable", "read-only"))
+
 def ginfo(ctx,console, args):
     guest = console.guest
@@ -450 +471 @@
     else:
         print "No additions"
+    usbs = ctx['global'].getArray(console, 'USBDevices')
+    print "Attached USB:"
+    for ud in usbs:
+         printUsbDev(ctx,ud)
+    rusbs = ctx['global'].getArray(console, 'remoteUSBDevices')
+    print "Remote USB:"
+    for ud in rusbs:
+        printHostUsbDev(ctx,ud)
+    print "Transient shared folders:"
+    sfs =  rusbs = ctx['global'].getArray(console, 'sharedFolders')
+    for sf in sfs:
+        printSf(ctx,sf)
 
 def cmdExistingVm(ctx,mach,cmd,args):
@@ -487 +520 @@
          'plugcpu':         lambda: plugCpu(ctx, session.machine, session, args),
          'unplugcpu':       lambda: unplugCpu(ctx, session.machine, session, args),
-         'mountiso':        lambda: mountIso(ctx, session.machine, session, args)
+         'mountiso':        lambda: mountIso(ctx, session.machine, session, args),
          }
     try:
@@ -1032 +1065 @@
    print "USB devices:"
    for ud in ctx['global'].getArray(host, 'USBDevices'):
-       print "  %s (vendorId=%d productId=%d serial=%s) %s" %(ud.product, ud.vendorId, ud.productId, ud.serialNumber, getUSBStateString(ud.state))
+       printUsbHostDev(ctx,ud)
 
    if ctx['perf']:
@@ -1269 +1302 @@
     p = app.write(format, path)
     progressBar(ctx, p)
-    print "Exported to %s in format %s" %(path, format)
+    if (p.completed and int(p.resultCode) == 0):
+        print "Exported to %s in format %s" %(path, format)
     return 0
 
@@ -1503 +1537 @@
    return 0
 
+def listUsbCmd(ctx,args):
+   if (len(args) > 1):
+      print "usage: listUsb"
+      return 0
+
+   host = ctx['vb'].host
+   for ud in ctx['global'].getArray(host, 'USBDevices'):
+       printHostUsbDev(ctx,ud)
+
+   return 0
+
 def createHddCmd(ctx,args):
    if (len(args) < 3):
@@ -1812 +1857 @@
    return 0
 
+def usbctr(ctx,mach,console,args):
+    if (args[0]):
+        console.attachUSBDevice(args[1])
+    else:
+        console.detachUSBDevice(args[1])
+
+def attachUsbCmd(ctx,args):
+   if (len(args) < 3):
+      print "usage: attachUsb vm deviceuid"
+      return 0
+
+   mach = argsToMach(ctx,args)
+   if mach is None:
+        return 0
+   dev = args[2]
+   cmdExistingVm(ctx, mach, 'guestlambda', [usbctr,True,dev])
+   return 0
+
+def detachUsbCmd(ctx,args):
+   if (len(args) < 3):
+      print "usage: detachUsb vm deviceuid"
+      return 0
+
+   mach = argsToMach(ctx,args)
+   if mach is None:
+        return 0
+   dev = args[2]
+   cmdExistingVm(ctx, mach, 'guestlambda', [usbctr,False,dev])
+   return 0
 
 aliases = {'s':'start',
@@ -1877 +1951 @@
             'attachCtr': ['Attach storage controller to the VM: attachCtr win Ctr0 IDE ICH6', attachCtrCmd, 0],
             'detachCtr': ['Detach HDD from the VM: detachCtr win Ctr0', detachCtrCmd, 0],
-            'listMediums': ['List mediums known to this VBox instance', listMediumsCmd, 0]
+            'attachUsb': ['Attach USB device to the VM (use listUsb to show available devices): attachUsb win uuid', attachUsbCmd, 0],
+            'detachUsb': ['Detach USB device from the VM: detachUsb win uui', detachUsbCmd, 0],
+            'listMediums': ['List mediums known to this VBox instance', listMediumsCmd, 0],
+            'listUsb': ['List known USB devices', listUsbCmd, 0]
             }