Skip to content

List USB qubes independent of domain state #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 1 commit into from
May 6, 2026
Merged

List USB qubes independent of domain state #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qubes_config/global_config/usb_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ def __init__(
usb_qubes: Set[qubesadmin.vm.QubesVM] = set()

for vm in self.qapp.domains:
for assignment in vm.devices["pci"].get_attached_devices():
for assignment in vm.devices["pci"].get_assigned_devices():
cats = [infc.category for infc in assignment.device.interfaces]
if DeviceCategory.PCI_USB in cats:
usb_qubes.add(vm)
Expand Down
21 changes: 9 additions & 12 deletions qubes_config/tests/test_usb_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,11 +969,10 @@ def test_u2f_handler_add_without_service(test_qapp, test_policy_manager, real_bu

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

def test_devices_handler_detect_usbvms(test_qapp, test_policy_manager, real_builder):
test_qapp.expected_calls[
("sys-usb", "admin.vm.device.pci.Attached", None, None)
("sys-usb", "admin.vm.device.pci.Assigned", None, None)
] = (
b"0\x00dom0+00_0d.0 device_id='*' port_id='00_0d.0' devclass='pci' "
b"backend_domain='dom0' mode='required' "
b"_no-strict-reset='yes'\n"
b"0\0dom0+00_0d.0 backend_domain='dom0' devclass='pci' "
b"port_id='00_0d.0' mode='required' frontend_domain='sys-usb'\n"
)
test_qapp.expected_calls[
("test-standalone", "admin.vm.device.pci.Attached", None, None)
("test-standalone", "admin.vm.device.pci.Assigned", None, None)
] = (
b"0\x00dom0+00_0f.0 device_id='*' port_id='00_0f.0' devclass='pci' "
b"backend_domain='dom0' mode='required' "
b"_no-strict-reset='yes'\n"
b"0\0dom0+00_0f.0 backend_domain='dom0' devclass='pci' "
b"port_id='00_0f.0' mode='required' frontend_domain='test-standalone'\n"
)
test_qapp.expected_calls[("dom0", "admin.vm.device.pci.Available", None, None)] = (
b"0\x0000_0f.0 device_id='0000:0000::p0c0300' port_id='00_0f.0' "
Expand Down