Changeset 35885 in vbox for trunk/src/VBox/Frontends/VBoxShell

Timestamp:

Feb 8, 2011 1:20:04 AM (14 years ago)

Author:

vboxsync

Message:

Main, VMM, vboxshell: more PCI work (persistent settings, logging, more driver API), API consumer in vboxshell

File:

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

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

@@ -3103 +3103 @@
     return
 
+def parsePci(str):
+    pcire = re.compile(r'(?P<b>\d+):(?P<d>\d+)\.(?P<f>\d)')
+    m = pcire.search(str)
+    if m is None:
+        return -1
+    dict = m.groupdict()
+    return ((int(dict['b'])) << 8) | ((int(dict['d'])) << 3) | int(dict['f'])
 
 def lspciCmd(ctx, args):
@@ -3112 +3119 @@
         return 0
     cmdExistingVm(ctx, mach, 'guestlambda', [lambda ctx,mach,console,args:  lspci(ctx, console)])
+    return 0
+
+def attachpciCmd(ctx, args):
+    if (len(args) < 3):
+        print "usage: attachpci vm hostpci <guestpci>"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    hostaddr = parsePci(args[2])
+    if hostaddr == -1:
+        print "invalid host PCI %s, accepted format 01:02.3 for bus 1, device 2, function 3" %(args[2])
+        return 0
+
+    if (len(args) > 3):
+        guestaddr = parsePci(args[3])
+        if guestaddr == -1:
+            print "invalid guest PCI %s, accepted format 01:02.3 for bus 1, device 2, function 3" %(args[3])
+            return 0
+    else:
+        guestaddr = hostaddr
+    cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.attachHostPciDevice(hostaddr, guestaddr, True))
+    return 0
+
+def detachpciCmd(ctx, args):
+    if (len(args) < 3):
+        print "usage: detachpci vm hostpci"
+        return 0
+    mach = argsToMach(ctx,args)
+    if mach == None:
+        return 0
+    hostaddr = parsePci(args[2])
+    if hostaddr == -1:
+        print "invalid host PCI %s, accepted format 01:02.3 for bus 1, device 2, function 3" %(args[2])
+        return 0
+
+    cmdClosedVm(ctx, mach, 'guestlambda', lambda ctx,mach,a: mach.detachHostPciDevice(hostaddr))
     return 0
 
@@ -3200 +3244 @@
             'recordDemo':['Record demo: recordDemo Win32 file.dmo 10', recordDemoCmd, 0],
             'playbackDemo':['Playback demo: playbackDemo Win32 file.dmo 10', playbackDemoCmd, 0],
-            'lspci': ['List PCI devices attached to the VM: lspci Win32', lspciCmd]
+            'lspci': ['List PCI devices attached to the VM: lspci Win32', lspciCmd, 0],
+            'attachpci': ['Attach host PCI device to the VM: attachpci Win32 01:00.0', attachpciCmd, 0],
+            'detachpci': ['Detach host PCI device from the VM: detachpci Win32 01:00.0', detachpciCmd, 0]
             }