q-dev: port assignment

fix assignment

doc/manpages/qvm-device.rst

@@ -112,6 +112,10 @@ Assign the device with *DEVICE_ID* from *BACKEND_DOMAIN* to the domain *VMNAME*
 
    Assign device persistently which means it will be required to the qube's startup and then automatically attached.
 
+.. option:: --port
+
+   Ignore device presented identity and attach any device connected to the given port number.
+
 aliases: s
 
 unassign

qubesadmin/backup/restore.py

@@ -2091,7 +2091,7 @@ def _restore_vms_metadata(self, restore_info):
                         backend_domain=backend_domain,
                         ident=ident,
                         options=options,
-                        required=True)
+                        attach_automatically=True)
                     try:
                         if not self.options.verify_only:
                             new_vm.devices[bus].attach(assignment)

qubesadmin/devices.py

@@ -691,6 +691,8 @@ def __init__(self, backend_domain, ident, options=None,
                  required=False, attach_automatically=False):
         super().__init__(backend_domain, ident, devclass)
         self.__options = options or {}
+        if required:
+            assert attach_automatically
         self.__required = required
         self.__attach_automatically = attach_automatically
         self.__frontend_domain = frontend_domain

qubesadmin/tests/devices.py

@@ -137,22 +137,24 @@ def test_021_attach_options(self):
     def test_022_attach_required(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.device.test.Attach', 'test-vm2+dev1',
-             b"required='yes' attach_automatically='no' ident='dev1' "
+             b"required='yes' attach_automatically='yes' ident='dev1' "
              b"devclass='test' backend_domain='test-vm2' "
              b"frontend_domain='test-vm'")] = b'0\0'
         assign = qubesadmin.devices.DeviceAssignment(
-            self.app.domains['test-vm2'], 'dev1', required=True)
+            self.app.domains['test-vm2'], 'dev1',
+            attach_automatically=True, required=True)
         self.vm.devices['test'].attach(assign)
         self.assertAllCalled()
 
     def test_023_attach_required_options(self):
         self.app.expected_calls[
             ('test-vm', 'admin.vm.device.test.Attach', 'test-vm2+dev1',
-             b"required='yes' attach_automatically='no' ident='dev1' "
+             b"required='yes' attach_automatically='yes' ident='dev1' "
              b"devclass='test' backend_domain='test-vm2' "
              b"frontend_domain='test-vm' _ro='True'")] = b'0\0'
         assign = qubesadmin.devices.DeviceAssignment(
-            self.app.domains['test-vm2'], 'dev1', required=True)
+            self.app.domains['test-vm2'], 'dev1',
+            attach_automatically=True, required=True)
         assign.options['ro'] = True
         self.vm.devices['test'].attach(assign)
         self.assertAllCalled()

qubesadmin/tools/qvm_device.py

@@ -177,6 +177,8 @@ def assign_device(args):
     if args.ro:
         options['read-only'] = 'yes'
     options['identity'] = device.self_identity
+    if args.port:
+        options['identity'] = 'any'
     assignment.options = options
     vm.devices[args.devclass].assign(assignment)
     if vm.is_running() and not assignment.attached:
@@ -378,7 +380,12 @@ def get_parser(device_class=None):
                                help="Mark device as required so it will "
                                     "be required to the qube's startup and then"
                                     " automatically attached)")
-
+    assign_parser.add_argument('--port',
+                               action='store_true',
+                               default=False,
+                               help="Ignore device presented identity and "
+                                    "attach any device connected to the given "
+                                    "port number")
     attach_parser.set_defaults(func=attach_device)
     detach_parser.set_defaults(func=detach_device)
     assign_parser.set_defaults(func=assign_device)

qubesadmin/tools/qvm_start.py

@@ -159,6 +159,7 @@ def get_drive_assignment(app, drive_str):
         backend_domain,
         ident,
         options=options,
+        attach_automatically=True,
         required=True)
 
     return assignment