Changeset 43425 in vbox for trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

Timestamp:

Sep 25, 2012 9:25:42 AM (12 years ago)

Author:

vboxsync

Message:

VBoxShell: adapted to interface changes in r79727 (thanks Bertrand!)

File:

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

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

@@ -961 +961 @@
 
     print "  Use universal time [RTCUseUTC]: %s" %(asState(mach.RTCUseUTC))
-    print "  HPET [hpetEnabled]: %s" %(asState(mach.hpetEnabled))
+    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))
     if mach.USBController.enabled:
-        print "  USB [via USBController]: high speed %s" %(asState(mach.USBController.enabledEhci))
+        print "  USB [via USBController]: high speed %s" %(asState(mach.USBController.enabledEHCI))
     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 "  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
@@ -978 +978 @@
     print
     print colCat(ctx,"  I/O subsystem info:")
-    print "   Cache enabled [ioCacheEnabled]: %s" %(asState(mach.ioCacheEnabled))
-    print "   Cache size [ioCacheSize]: %dM" %(mach.ioCacheSize)
+    print "   Cache enabled [IOCacheEnabled]: %s" %(asState(mach.IOCacheEnabled))
+    print "   Cache size [IOCacheSize]: %dM" %(mach.IOCacheSize)
 
     controllers = ctx['global'].getArray(mach, 'storageControllers')
@@ -1502 +1502 @@
    print colCat(ctx,"OS:");
    print "  %s (%s)" %(host.operatingSystem, host.OSVersion)
-   if host.Acceleration3DAvailable:
+   if host.acceleration3DAvailable:
        print colCat(ctx,"3D acceleration available")
    else:
@@ -2683 +2683 @@
     yesno = {0: 'off', 1: 'on'}
     if len(args) == 1:
-        msg = 'passdomain:%s, proxy:%s, usehostresolver:%s' % (yesno[int(nat.dnsPassDomain)], yesno[int(nat.dnsProxy)], yesno[int(nat.dnsUseHostResolver)])
+        msg = 'passdomain:%s, proxy:%s, usehostresolver:%s' % (yesno[int(nat.DNSPassDomain)], yesno[int(nat.DNSProxy)], yesno[int(nat.DNSUseHostResolver)])
         return (0, [msg])
     else:
-        nat.dnsPassDomain = 'passdomain' in args
-        nat.dnsProxy =  'proxy' in args
-        nat.dnsUseHostResolver =  'usehostresolver' in args
+        nat.DNSPassDomain = 'passdomain' in args
+        nat.DNSProxy =  'proxy' in args
+        nat.DNSUseHostResolver =  'usehostresolver' in args
     return (0, None)
 
@@ -2699 +2699 @@
     """
     if len(args) == 1:
-        server = nat.tftpNextServer
+        server = nat.TFTPNextServer
         if server is None:
             server = nat.network
@@ -2709 +2709 @@
             (a,b,c,d) = server.split('.')
             server = '%d.%d.%d.4' % (a,b,c)
-        prefix = nat.tftpPrefix
+        prefix = nat.TFTPPrefix
         if prefix is None:
             prefix = '%s/TFTP/' % (ctx['vb'].homeFolder)
-        bootfile = nat.tftpBootFile
+        bootfile = nat.TFTPBootFile
         if bootfile is None:
             bootfile = '%s.pxe' % (mach.name)
@@ -2724 +2724 @@
             print natTftp.__doc__
             return (1, None)
-        if cmd == 'prefix': nat.tftpPrefix = args[2]
-        elif cmd == 'bootfile': nat.tftpBootFile = args[2]
-        elif cmd == 'server': nat.tftpNextServer = args[2]
+        if cmd == 'prefix': nat.TFTPPrefix = args[2]
+        elif cmd == 'bootfile': nat.TFTPBootFile = args[2]
+        elif cmd == 'server': nat.TFTPNextServer = args[2]
         else:
             print "invalid cmd:", cmd
@@ -2845 +2845 @@
 
     adapter = mach.getNetworkAdapter(nicnum)
-    natEngine = adapter.natDriver
+    natEngine = adapter.NATEngine
     (rc, report) = natcommands[func](ctx, mach, nicnum, natEngine, cmdargs)
     if rosession == 0:
@@ -3101 +3101 @@
 
 def lspci(ctx, console):
-    assigned = ctx['global'].getArray(console.machine, 'pciDeviceAssignments')
+    assigned = ctx['global'].getArray(console.machine, 'PCIDeviceAssignments')
     for a in assigned:
         if a.isPhysicalDevice:
             print "%s: assigned host device %s guest %s" %(colDev(ctx, a.name), pciAddr(ctx, a.hostAddress), pciAddr(ctx, a.guestAddress))
 
-    atts = ctx['global'].getArray(console, 'attachedPciDevices')
+    atts = ctx['global'].getArray(console, 'attachedPCIDevices')
     for a in atts:
         if a.isPhysicalDevice:
@@ -3151 +3151 @@
     else:
         guestaddr = hostaddr
-    cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.attachHostPciDevice(hostaddr, guestaddr, True))
+    cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.attachHostPCIDevice(hostaddr, guestaddr, True))
     return 0
 
@@ -3166 +3166 @@
         return 0
 
-    cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.detachHostPciDevice(hostaddr))
+    cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.detachHostPCIDevice(hostaddr))
     return 0