Skip to content

Commit 6b031a0

Browse files
committed
q-dev: backward compatible device_protocol
1 parent 5ea5fc6 commit 6b031a0

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

qubes/device_protocol.py

+13-5
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,10 @@ class DeviceInfo(Port):
412412

413413
def __init__(
414414
self,
415-
port: Port,
415+
port: Optional[Port] = None,
416+
backend_domain: Optional = None,
417+
ident: Optional = None,
418+
devclass: Optional = None,
416419
vendor: Optional[str] = None,
417420
product: Optional[str] = None,
418421
manufacturer: Optional[str] = None,
@@ -424,6 +427,8 @@ def __init__(
424427
self_identity: Optional[str] = None,
425428
**kwargs
426429
):
430+
if port is None:
431+
port = Port(backend_domain, ident, devclass)
427432
super().__init__(port.backend_domain, port.ident, port.devclass)
428433

429434
self._vendor = vendor
@@ -821,21 +826,24 @@ class DeviceAssignment(Port):
821826

822827
def __init__(
823828
self,
824-
port: Port,
829+
port: Optional[Port] = None,
830+
backend_domain: Optional = None,
831+
ident: Optional = None,
832+
devclass: Optional = None,
825833
device_identity=None,
826834
frontend_domain=None,
827835
options=None,
828836
mode: Union[str, AssignmentMode] = "manual",
829837
):
838+
if port is None:
839+
port = Port(backend_domain, ident, devclass)
830840
super().__init__(port.backend_domain, port.ident, port.devclass)
831841
self.__options = options or {}
832842
if isinstance(mode, AssignmentMode):
833843
self.mode = mode
834844
else:
835845
self.mode = AssignmentMode(mode)
836846
self.frontend_domain = frontend_domain
837-
if device_identity == 'any':
838-
device_identity = None
839847
self.device_identity = device_identity
840848

841849
def clone(self, **kwargs):
@@ -912,7 +920,7 @@ def attach_automatically(self) -> bool:
912920
return self.mode in (
913921
AssignmentMode.AUTO,
914922
AssignmentMode.ASK,
915-
AssignmentMode.REQUIRED,
923+
AssignmentMode.REQUIRED
916924
)
917925

918926
@attach_automatically.setter

0 commit comments

Comments
 (0)