Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0/qvm-usb: attach works again for dom0 backend

Browse Source
This commit is contained in:
Alexandre Bezroutchko 2012-10-11 02:10:47 +02:00
parent db4d49b19c
commit d613d6a04d
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.pvusb
View File

@ -26,7 +26,11 @@ In appvms, after each reboot:
sudo ./install-pvusb-frontend.sh sudo ./install-pvusb-frontend.sh
In dom0, after each usbvm and appvm reboot (FIXME): In dom0, after each usbvm and appvm reboot (FIXME):
sudo initpv.py <backend-id> <frontend-id> <device-id> sudo ../pvusb-scripts/initpv.py <backend-id> <frontend-id> <device-id>
After the above is done:
'qvm-usb -l' in usbvm displays a list of local USB devices
'lsusb' in appvm displays an entry for the root hub
Attach Attach
~~~~~~ ~~~~~~

4
dom0/qvm-core/qubesutils.py
View File

@ -574,8 +574,8 @@ def do_usb_attach(vm, backend_vm, device, frontend, auto_detach, wait):
else: else:
raise QubesException("Device %s from %s already connected to VM %s as %s" % (device, backend_vm.name, attached_vm['vm'], attached_vm['frontend'])) raise QubesException("Device %s from %s already connected to VM %s as %s" % (device, backend_vm.name, attached_vm['vm'], attached_vm['frontend']))
# FIXME sudo # Run helper script
xl_cmd = [ 'sudo', '/usr/lib/qubes/xl-qvm-usb-attach.py', str(vm.xid), device, frontend, str(backend_vm.xid) ] xl_cmd = [ '/usr/lib/qubes/xl-qvm-usb-attach.py', str(vm.xid), device, frontend, str(backend_vm.xid) ]
subprocess.check_call(xl_cmd) subprocess.check_call(xl_cmd)
def usb_detach(vm, frontend, vm_xid = None): def usb_detach(vm, frontend, vm_xid = None):

15
misc/xl-qvm-usb-attach.py
View File

@ -24,16 +24,19 @@ if len(frontend)!=2:
sys.exit(1) sys.exit(1)
(controller, port)=frontend (controller, port)=frontend
backendvm_xid=0
if len(sys.argv)>4: if len(sys.argv)>4:
backendvm_xid=sys.argv[4] backendvm_xid=int(sys.argv[4])
backendvm_name=xen.lowlevel.xl.ctx().domid_to_name(backendvm_xid)
# determine the name of the backend-vm else:
backendvm_name=xen.lowlevel.xl.ctx().domid_to_name(int(backendvm_xid)) backendvm_xid=0
# FIXME: command injection # FIXME: command injection
os.system("xenstore-write /local/domain/%s/backend/vusb/%s/%s/port/%s %s" os.system("xenstore-write /local/domain/%s/backend/vusb/%s/%s/port/%s %s"
% (backendvm_xid, frontendvm_xid, controller, port, backendvm_device)) % (backendvm_xid, frontendvm_xid, controller, port, backendvm_device))
# FIXME: vm.run # FIXME: vm.run
print "### qvm-run %s sudo /usr/lib/qubes/vusb-ctl.py unbind %s" % (backendvm_name, backendvm_device) cmd = "sudo /usr/lib/qubes/vusb-ctl.py bind %s" % backendvm_device
if backendvm_xid == 0:
os.system(cmd)
else:
os.system("qvm-run -p %s '%s'" % (backendvm_name, cmd))