From bee83bea0d568ccd1eea9a70b90982125f5048b8 Mon Sep 17 00:00:00 2001 From: Alexandre Bezroutchko Date: Sun, 28 Oct 2012 03:49:53 +0100 Subject: [PATCH 1/3] dom0/qvm-create: fixed couple typos --- dom0/qvm-tools/qvm-create | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom0/qvm-tools/qvm-create b/dom0/qvm-tools/qvm-create index d1c4b5ee..42bf67e3 100755 --- a/dom0/qvm-tools/qvm-create +++ b/dom0/qvm-tools/qvm-create @@ -111,7 +111,7 @@ def main(): if options.template is not None: template = qvm_collection.get_vm_by_name(options.template) if template is None: - print >> sys.stderr, "There is no (Templete)VM with the name '{0}'".format(options.template) + print >> sys.stderr, "There is no (Template)VM with the name '{0}'".format(options.template) exit (1) if not template.is_template(): print >> sys.stderr, "VM '{0}' is not a TemplateVM".format(options.template) @@ -121,7 +121,7 @@ def main(): elif not options.hvm: if qvm_collection.get_default_template() is None: - print >> sys.stderr, "No default TempleteVM defined!" + print >> sys.stderr, "No default TemplateVM defined!" exit (1) else: template = qvm_collection.get_default_template() From d0203af098848e124074e5748372ad959691ea2f Mon Sep 17 00:00:00 2001 From: Alexandre Bezroutchko Date: Thu, 8 Nov 2012 10:44:20 +0100 Subject: [PATCH 2/3] dom0+vm/usb: added another bug to readme --- README.pvusb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.pvusb b/README.pvusb index 419737a7..033f6ef5 100644 --- a/README.pvusb +++ b/README.pvusb @@ -66,4 +66,4 @@ deployed into the backend domain. The initialization code is qubesutils.py in us should probably also be moved into an external helper. Perhaps the functionality of these external helpers should be merged into libxl? The is one catch is invokation of vusb helper in the backend domain -- now it relies on qubes-specific API. - +* After reboot attached USB devices are not listed by 'qvm-usb -l' until replugged. From e58b432d09ff2009f2ca23dc3ffa89e110079fe8 Mon Sep 17 00:00:00 2001 From: Alexandre Bezroutchko Date: Sat, 17 Nov 2012 03:25:22 +0100 Subject: [PATCH 3/3] dom0/pvusb: fix a typo in usb_find_unused_frontend() --- dom0/qvm-core/qubesutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom0/qvm-core/qubesutils.py b/dom0/qvm-core/qubesutils.py index 555a994a..e9a47692 100644 --- a/dom0/qvm-core/qubesutils.py +++ b/dom0/qvm-core/qubesutils.py @@ -610,7 +610,7 @@ def usb_find_unused_frontend(xs_trans, backend_vm_xid, vm_xid, usb_ver): print >> sys.stderr, "Invalid port in VM %d frontend_dev %d" % (vm_xid, frontend_dev) continue port = int(port) - dev = xs.read(xs_trans, '/local/domain/%d/backend/vusb/%s/%s/port/%s' % (backend_vm, vm, frontend_dev, port)) + dev = xs.read(xs_trans, '/local/domain/%d/backend/vusb/%d/%s/port/%s' % (backend_vm_xid, vm_xid, frontend_dev, port)) # Sanitize device id if not usb_port_re.match(dev): print >> sys.stderr, "Invalid device id in backend VM %d @ %d/%d/port/%d" % \