q-dev: fixes

Author: piotrbartman

qubes/api/admin.py

@@ -27,6 +27,7 @@
 import string
 import subprocess
 import pathlib
+import sys
 
 import libvirt
 import lxml.etree
@@ -1280,22 +1281,24 @@ async def vm_device_attached(self, endpoint):
                 raise qubes.exc.QubesException("qubesd shutdown in progress")
             raise
         if self.arg:
-            select_backend, select_ident = self.arg.split('+', 1)
+            select_backend, select_ident = self.arg.split('+', 1)  # TODO
             device_assignments = [dev for dev in device_assignments
                                   if (str(dev.backend_domain), dev.port_id)
                                   == (select_backend, select_ident)]
             # no duplicated devices, but device may not exist, in which case
             #  the list is empty
             self.enforce(len(device_assignments) <= 1)
-        device_assignments = self.fire_event_for_filter(device_assignments,
-                                                        devclass=devclass)
+        device_assignments = [
+            a.clone(device=self.app.domains[a.backend_name
+            ].devices[devclass][a.port_id]) for a in device_assignments]
+        device_assignments = self.fire_event_for_filter(
+            device_assignments, devclass=devclass)
 
         dev_info = {
             (f'{assignment.backend_domain}'
              f'+{assignment.port_id}:{assignment.device_id}'):
                 assignment.serialize().decode('ascii', errors="ignore")
             for assignment in device_assignments}
-
         return ''.join('{} {}\n'.format(port_id, dev_info[port_id])
                        for port_id in sorted(dev_info))
 
@@ -1363,7 +1366,7 @@ async def vm_device_unassign(self, endpoint):
             ep.name
             for ep in importlib.metadata.entry_points(group='qubes.devices')),
         scope='local', execute=True)
-    async def vm_device_unassign(self, endpoint, untrusted_payload):
+    async def vm_device_attach(self, endpoint, untrusted_payload):
         devclass = endpoint
         dev = self.load_device_info(devclass)
         assignment = DeviceAssignment.deserialize(

qubes/device_protocol.py

@@ -1034,7 +1034,7 @@ def __init__(
             mode: Union[str, AssignmentMode] = "manual",
     ):
         if isinstance(device, DeviceInfo):
-            device = VirtualDevice(device.port, device._device_id)
+            device = VirtualDevice(device.port, device.device_id)
         self.virtual_device = device
         self.__options = options or {}
         if isinstance(mode, AssignmentMode):

qubes/tests/devices_block.py

@@ -673,8 +673,6 @@ def test_060_on_qdb_change_added(self):
         self.ext.on_qdb_change(back_vm, None, None)
 
         self.assertEqual(self.ext.devices_cache, {'sys-usb': {'sda': None}})
-        print(back_vm.fired_events, file=sys.stderr)  # TODO
-        print(exp_dev, file=sys.stderr)  # TODO
         self.assertEqual(
             back_vm.fired_events[
                 ('device-added:block', frozenset({('device', exp_dev)}))], 1)

templates/libvirt/xen.xml

@@ -157,7 +157,7 @@
             {# start external devices from xvdi #}
             {% set counter = {'i': 4} %}
             {% for assignment in vm.devices.block.get_assigned_devices(True) %}
-                {% set device = assignment.device %}
+                {% set device = assignment.devices[0] %}
                 {% set options = assignment.options %}
                 {% include 'libvirt/devices/block.xml' %}
             {% endfor %}
@@ -167,7 +167,7 @@
             {% endif %}
 
             {% for assignment in vm.devices.pci.get_assigned_devices(True) %}
-                {% set device = assignment.device %}
+                {% set device = assignment.devices[0] %}
                 {% set options = assignment.options %}
                 {% set power_mgmt =
                     vm.app.domains[0].features.get('suspend-s0ix', False) %}