Skip to content

Improve reactions to missing PCI devices #440

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

Open
marmarta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve reactions to missing PCI devices #440

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
6 changes: 2 additions & 4 deletions qubesmanager/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,15 +1551,13 @@ def __init_devices_tab__(self):

# pylint: disable=too-few-public-methods
class DevListWidgetItem(QtWidgets.QListWidgetItem):
def __init__(self, dev, unknown=False, parent=None):
def __init__(self, dev, parent=None):
super().__init__(parent)
name = (
dev.port_id.replace("_", ":").replace("-", " -> ")
+ " "
+ dev.description
)
if unknown:
name += " (unknown)"
self.setText(name)
self.dev = dev
intfs = list({i.category for i in dev.interfaces})
Expand All @@ -1580,7 +1578,7 @@ def __init__(self, dev, unknown=False, parent=None):
for ass in attached:
if not any(ass.matches(dev) for dev in dom0_devs):
self.dev_list.selected_list.addItem(
DevListWidgetItem(ass.device, unknown=True)
DevListWidgetItem(ass.device)
)

if (
Expand Down
20 changes: 18 additions & 2 deletions qubesmanager/tests/test_vm_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,21 @@ def settings_fixture(
)
)

# orphaned device
test_qubes_app._devices.append(
MockDevice(
test_qubes_app,
dev_class="pci",
device_id="0x8008:0x6789::p050000",
backend_vm="dom0",
port="00_04.3",
product="Weird Lost Device",
vendor="Test Vendor",
assigned=[("test-pci-dev", "required", None)],
device_unknown=True,
)
)

# add a TemplateVM with some boot modes
test_qubes_app._qubes["fedora-36-bootmodes"] = MockQube(
name="fedora-36-bootmodes",
Expand Down Expand Up @@ -2007,8 +2022,9 @@ def test_602_device_remove(settings_fixture):
selected_items = []
for i in range(settings_window.dev_list.selected_list.count()):
item = settings_window.dev_list.selected_list.item(i)
selected_items.append(item.text())
item.setSelected(True)
if "unknown " not in item.text():
selected_items.append(item.text())
item.setSelected(True)

assert len(selected_items) == 1

Expand Down