Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 35568)
+++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 35569)
@@ -2173,5 +2173,5 @@
    loc = args[2]
    try:
-      hdd = vb.findHardDisk(loc)
+      hdd = vb.findMedium(loc, ctx['global'].constants.DeviceType_HardDisk)
    except:
       print "no HDD with path %s registered" %(loc)
@@ -2195,5 +2195,5 @@
 
 def detachMedium(ctx,mid,medium):
-    cmdClosedVm(ctx, mach, detachVmDevice, [medium.id])
+    cmdClosedVm(ctx, machById(ctx, mid), detachVmDevice, [medium])
 
 def detachHddCmd(ctx,args):
@@ -2208,10 +2208,10 @@
    loc = args[2]
    try:
-      hdd = vb.findHardDisk(loc)
+      hdd = vb.findMedium(loc, ctx['global'].constants.DeviceType_HardDisk)
    except:
       print "no HDD with path %s registered" %(loc)
       return 0
 
-   detachMedium(ctx,mach.id,hdd)
+   detachMedium(ctx, mach.id, hdd)
    return 0
 
@@ -2228,5 +2228,5 @@
       vmunreg = 0
    try:
-      hdd = vb.findHardDisk(loc)
+      hdd = vb.findMedium(loc, ctx['global'].constants.DeviceType_HardDisk)
    except:
       print "no HDD with path %s registered" %(loc)
@@ -2238,5 +2238,5 @@
          for m in machs:
             print "Trying to detach from %s" %(m)
-            detachMedium(ctx,m,hdd)
+            detachMedium(ctx, m, hdd)
       except Exception, e:
          print 'failed: ',e
@@ -2253,5 +2253,5 @@
    loc = args[1]
    try:
-      hdd = vb.findHardDisk(loc)
+      hdd = vb.findMedium(loc, ctx['global'].constants.DeviceType_HardDisk)
    except:
       print "no HDD with path %s registered" %(loc)
@@ -2282,5 +2282,5 @@
    loc = args[1]
    try:
-      dvd = vb.findDVDImage(loc)
+      dvd = vb.findMedium(loc, )
    except:
       print "no DVD with path %s registered" %(loc)
@@ -2300,5 +2300,5 @@
    loc = args[1]
    try:
-      dvd = vb.findDVDImage(loc)
+      dvd = vb.findMedium(loc, ctx['global'].constants.DeviceType_DVD)
    except:
       print "no DVD with path %s registered" %(loc)
@@ -2323,5 +2323,5 @@
    loc = args[2]
    try:
-      dvd = vb.findDVDImage(loc)
+      dvd = vb.findMedium(loc, ctx['global'].constants.DeviceType_DVD)
    except:
       print "no DVD with path %s registered" %(loc)
@@ -2332,5 +2332,5 @@
    else:
        [ctr, port, slot] = findDevOfType(ctx, mach, ctx['global'].constants.DeviceType_DVD)
-   cmdClosedVm(ctx, mach, lambda ctx,mach,args: mach.attachDevice(ctr, port, slot, ctx['global'].constants.DeviceType_DVD,dvd.id))
+   cmdClosedVm(ctx, mach, lambda ctx,mach,args: mach.attachDevice(ctr, port, slot, ctx['global'].constants.DeviceType_DVD, dvd))
    return 0
 
@@ -2346,10 +2346,10 @@
    loc = args[2]
    try:
-      dvd = vb.findDVDImage(loc)
+      dvd = vb.findMedium(loc, ctx['global'].constants.DeviceType_DVD)
    except:
       print "no DVD with path %s registered" %(loc)
       return 0
 
-   detachMedium(ctx,mach.id,dvd)
+   detachMedium(ctx, mach.id, dvd)
    return 0
 
@@ -2365,5 +2365,5 @@
    loc = args[2]
    try:
-      dvd = vb.findDVDImage(loc)
+      dvd = vb.findMedium(loc, ctx['global'].constants.DeviceType_DVD)
    except:
       print "no DVD with path %s registered" %(loc)
@@ -2377,5 +2377,5 @@
        [ctr, port, slot] = findDevOfType(ctx, mach, ctx['global'].constants.DeviceType_DVD)
 
-   cmdExistingVm(ctx, mach, 'mountiso', [ctr, port, slot, dvd.id, True])
+   cmdExistingVm(ctx, mach, 'mountiso', [ctr, port, slot, dvd, True])
 
    return 0
@@ -2391,5 +2391,5 @@
    vb = ctx['vb']
 
-   if len(args) > 2:
+   if len(args) > 3:
        ctr = args[2]
        (port,slot) = args[3].split(":")
@@ -2398,5 +2398,5 @@
        [ctr, port, slot] = findDevOfType(ctx, mach, ctx['global'].constants.DeviceType_DVD)
 
-   cmdExistingVm(ctx, mach, 'mountiso', [ctr, port, slot, "", True])
+   cmdExistingVm(ctx, mach, 'mountiso', [ctr, port, slot, None, True])
 
    return 0