Skip to content

Commit c20e274

Browse files
committed
List USB qubes independent of domain state
1 parent a89069d commit c20e274

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

qubes_config/global_config/usb_devices.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ def __init__(
714714
usb_qubes: Set[qubesadmin.vm.QubesVM] = set()
715715

716716
for vm in self.qapp.domains:
717-
for assignment in vm.devices["pci"].get_attached_devices():
717+
for assignment in vm.devices["pci"].get_assigned_devices():
718718
cats = [infc.category for infc in assignment.device.interfaces]
719719
if DeviceCategory.PCI_USB in cats:
720720
usb_qubes.add(vm)

qubes_config/tests/test_usb_devices.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -969,11 +969,10 @@ def test_u2f_handler_add_without_service(test_qapp, test_policy_manager, real_bu
969969

970970
def test_devices_handler_unsaved(test_qapp, test_policy_manager, real_builder):
971971
test_qapp.expected_calls[
972-
("sys-usb", "admin.vm.device.pci.Attached", None, None)
972+
("sys-usb", "admin.vm.device.pci.Assigned", None, None)
973973
] = (
974-
b"0\x00dom0+00_0d.0 device_id='*' port_id='00_0d.0' devclass='pci' "
975-
b"backend_domain='dom0' mode='required' "
976-
b"_no-strict-reset='yes'\n"
974+
b"0\0dom0+00_0d.0 backend_domain='dom0' devclass='pci' "
975+
b"port_id='00_0d.0' mode='required' frontend_domain='sys-usb'\n"
977976
)
978977
test_qapp.expected_calls[("dom0", "admin.vm.device.pci.Available", None, None)] = (
979978
b"0\x0000_0d.0 device_id='0000:0000::p0c0300' port_id='00_0d.0' "
@@ -1000,18 +999,16 @@ def test_devices_handler_unsaved(test_qapp, test_policy_manager, real_builder):
1000999

10011000
def test_devices_handler_detect_usbvms(test_qapp, test_policy_manager, real_builder):
10021001
test_qapp.expected_calls[
1003-
("sys-usb", "admin.vm.device.pci.Attached", None, None)
1002+
("sys-usb", "admin.vm.device.pci.Assigned", None, None)
10041003
] = (
1005-
b"0\x00dom0+00_0d.0 device_id='*' port_id='00_0d.0' devclass='pci' "
1006-
b"backend_domain='dom0' mode='required' "
1007-
b"_no-strict-reset='yes'\n"
1004+
b"0\0dom0+00_0d.0 backend_domain='dom0' devclass='pci' "
1005+
b"port_id='00_0d.0' mode='required' frontend_domain='sys-usb'\n"
10081006
)
10091007
test_qapp.expected_calls[
1010-
("test-standalone", "admin.vm.device.pci.Attached", None, None)
1008+
("test-standalone", "admin.vm.device.pci.Assigned", None, None)
10111009
] = (
1012-
b"0\x00dom0+00_0f.0 device_id='*' port_id='00_0f.0' devclass='pci' "
1013-
b"backend_domain='dom0' mode='required' "
1014-
b"_no-strict-reset='yes'\n"
1010+
b"0\0dom0+00_0f.0 backend_domain='dom0' devclass='pci' "
1011+
b"port_id='00_0f.0' mode='required' frontend_domain='test-standalone'\n"
10151012
)
10161013
test_qapp.expected_calls[("dom0", "admin.vm.device.pci.Available", None, None)] = (
10171014
b"0\x0000_0f.0 device_id='0000:0000::p0c0300' port_id='00_0f.0' "

0 commit comments

Comments
 (0)