Merge branch 'master' of git://git.qubes-os.org/marmarek/core

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.

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" % \

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()