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

dom0/qvm-usb: qvm-usb is hopefully complete, stubs for all remaining usb_* methods implemented

Browse Source
This commit is contained in:
Alexandre Bezroutchko 2012-10-08 23:08:54 +02:00
parent 95b93a5082
commit 988d37fcb2
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,9 +400,6 @@ def block_detach_all(vm, vm_xid = None):
####### USB devices ###### ####### USB devices ######
def usb_check_attached(backend_vm, device, backend_xid = None):
return None
def usb_list(): def usb_list():
device_re = re.compile(r"^[0-9]+-[0-9]+$") device_re = re.compile(r"^[0-9]+-[0-9]+$")
# FIXME: any better idea of desc_re? # FIXME: any better idea of desc_re?
@ -435,6 +432,18 @@ def usb_list():
xs.transaction_end(xs_trans) xs.transaction_end(xs_trans)
return devices_list return devices_list
def usb_check_attached(backend_vm, device, backend_xid = None):
return None
def usb_attach(vm, backend_vm, device, frontend=None, auto_detach=False, wait=True):
raise NotImplementedError()
def usb_detach(vm, frontend, vm_xid = None):
raise NotImplementedError()
def usb_detach_all(vm, vm_xid = None):
raise NotImplementedError()
####### QubesWatch ###### ####### QubesWatch ######
def only_in_first_list(l1, l2): def only_in_first_list(l1, l2):

25
dom0/qvm-tools/qvm-usb
View File

@ -21,8 +21,7 @@
# #
from qubes.qubes import QubesVmCollection, QubesException from qubes.qubes import QubesVmCollection, QubesException
#from qubes.qubesutils import block_list,block_attach,block_detach,block_detach_all,block_check_attached from qubes.qubesutils import usb_list,usb_attach,usb_detach,usb_detach_all,usb_check_attached
from qubes.qubesutils import usb_list,usb_check_attached
from optparse import OptionParser from optparse import OptionParser
import sys import sys
import os import os
@ -40,8 +39,8 @@ def main():
parser.add_option ("-d", "--detach", action="store_true", dest="do_detach", default=False) parser.add_option ("-d", "--detach", action="store_true", dest="do_detach", default=False)
parser.add_option ("-f", "--frontend", dest="frontend", parser.add_option ("-f", "--frontend", dest="frontend",
help="Specify device id at destination VM [default: first unused]") help="Specify device id at destination VM [default: first unused]")
# parser.add_option ("--no-auto-detach", dest="auto_detach", action="store_false", default=True, parser.add_option ("--no-auto-detach", dest="auto_detach", action="store_false", default=True,
# help="Fail when device already connected to other VM") help="Fail when device already connected to other VM")
parser.add_option ("--force-root", action="store_true", dest="force_root", default=False, parser.add_option ("--force-root", action="store_true", dest="force_root", default=False,
help="Force to run, even with root privileges") help="Force to run, even with root privileges")
@ -65,15 +64,15 @@ def main():
qvm_collection.unlock_db() qvm_collection.unlock_db()
if options.do_attach: if options.do_attach:
if (len (args) < 2): if (len (args) != 2):
parser.error ("You must provide device and vm name!") parser.error ("You must provide vm name and device!")
vm = qvm_collection.get_vm_by_name(args[0]) vm = qvm_collection.get_vm_by_name(args[0])
if vm is None: if vm is None:
parser.error ("Invalid VM name: %s" % args[0]) parser.error ("Invalid VM name: %s" % args[0])
# FIXME: here we assume that device is always in form "domain:dev", which can be changed in the future # FIXME: here we assume that device is always in form "domain:dev", which can be changed in the future
if args[1].find(":") < 0: if args[1].find(":") < 0:
parser.error ("Invalid device syntax" % args[1]) parser.error ("Invalid device syntax: %s" % args[1])
dev_list = block_list() dev_list = usb_list()
if not args[1] in dev_list.keys(): if not args[1] in dev_list.keys():
parser.error ("Invalid device name: %s" % args[1]) parser.error ("Invalid device name: %s" % args[1])
dev = dev_list[args[1]] dev = dev_list[args[1]]
@ -91,18 +90,20 @@ def main():
elif options.do_detach: elif options.do_detach:
if (len (args) < 1): if (len (args) < 1):
parser.error ("You must provide device or vm name!") parser.error ("You must provide device or vm name!")
if len(args) > 1:
parser.error ("Too many parameters")
# Check if provided name is VM # Check if provided name is VM
vm = qvm_collection.get_vm_by_name(args[0]) vm = qvm_collection.get_vm_by_name(args[0])
if vm is not None: if vm is not None:
kwargs = {} kwargs = {}
if options.frontend: if options.frontend:
kwargs['frontend'] = options.frontend kwargs['frontend'] = options.frontend
block_detach(vm, **kwargs) usb_detach(vm, **kwargs)
else: else:
block_detach_all(vm) usb_detach_all(vm)
else: else:
# Maybe device? # Maybe device?
dev_list = block_list() dev_list = usb_list()
if not args[0] in dev_list.keys(): if not args[0] in dev_list.keys():
parser.error ("Invalid VM or device name: %s" % args[0]) parser.error ("Invalid VM or device name: %s" % args[0])
dev = dev_list[args[0]] dev = dev_list[args[0]]
@ -112,6 +113,8 @@ def main():
exit(0) exit(0)
usb_detach(None, attached_to['devid'], vm_xid=attached_to['xid']) usb_detach(None, attached_to['devid'], vm_xid=attached_to['xid'])
else: else:
if len(args) > 0:
parser.error ("Too many parameters")
# do_list # do_list
for dev in usb_list().values(): for dev in usb_list().values():
attached_to = usb_check_attached(None, dev['device'], backend_xid = dev['xid']) attached_to = usb_check_attached(None, dev['device'], backend_xid = dev['xid'])