q-dev: minor device_protocol fixes

Author: piotrbartman

qubes/device_protocol.py

@@ -161,7 +161,7 @@ def parse_basic_device_properties(
                 f"when expected port: {expected.port_id}.")
         properties.pop('port_id', None)
 
-        if expected.devclass == 'peripheral':
+        if not expected.has_devclass:
             expected = Port(
                 expected.backend_domain,
                 expected.port_id,
@@ -339,14 +339,18 @@ def devclass(self) -> str:
             return self.__devclass
         return "peripheral"
 
+    @property
+    def has_devclass(self):
+        return self.__devclass is not None
+
 
 class VirtualDevice:
     """
     Class of a device connected to *port*.
 
     Attributes:
-        port (Port): A unique identifier for the port within the backend domain.
-        device_id (str): A unique identifier for the device.
+        port (Port): Peripheral device port exposed by vm.
+        device_id (str): An identifier for the device.
     """
     def __init__(
             self,
@@ -553,10 +557,8 @@ def serialize(self) -> bytes:
             for key, value in (
                 ('device_id', self.device_id),
                 ('port_id', self.port_id),
-                ('devclass', self.devclass)))
-
-        properties += b' ' + DeviceSerializer.pack_property(
-            'backend_domain', self.backend_name)
+                ('devclass', self.devclass),
+                ('backend_domain', self.backend_name)))
 
         return properties
 
@@ -919,7 +921,8 @@ def subdevices(self) -> List[VirtualDevice]:
         If the device has subdevices (e.g., partitions of a USB stick),
         the subdevices id should be here.
         """
-        return [dev for dev in self.backend_domain.devices[self.devclass]
+        return [dev for devclass in self.backend_domain.devices.keys()
+                for dev in self.backend_domain.devices[devclass]
                 if dev.parent_device.port.port_id == self.port_id]
 
     @property
@@ -933,7 +936,7 @@ def serialize(self) -> bytes:
         """
         Serialize an object to be transmitted via Qubes API.
         """
-        properties = VirtualDevice.serialize(self)
+        properties = super().serialize()
         # 'attachment', 'interfaces', 'data', 'parent_device'
         # are not string, so they need special treatment
         default = DeviceInfo(self.port)
@@ -1192,7 +1195,7 @@ def device(self) -> DeviceInfo:
             return devices[0]
         if len(devices) > 1:
             raise ProtocolError("Too many devices matches to assignment")
-        raise ProtocolError("Any devices matches to assignment")
+        raise ProtocolError("No devices matches to assignment")
 
     @property
     def port(self) -> Port:
@@ -1309,7 +1312,7 @@ def _deserialize(
             device_id=properties['device_id'])
         # we do not need port, we need device
         del properties['port']
-        properties.pop('device_id', None)
+        del properties['device_id']
         properties['device'] = expected_device
 
         return cls(**properties)