Skip to content

q-dev: fix and unify device detach on frontend shutdown #60

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
piotrbartman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

q-dev: fix and unify device detach on frontend shutdown #60

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
4 changes: 4 additions & 0 deletions qubesusbproxy/core3ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,11 @@ async def on_domain_start(self, vm, _event, **_kwargs):
async def on_domain_shutdown(self, vm, _event, **_kwargs):
# pylint: disable=unused-argument
vm.fire_event("device-list-change:usb")
# devices exposed by the shutting-down backend vm:
# notify that they are gone and detach them from frontend vms
utils.device_list_change(self, {}, vm, None, USBDevice)
# devices attached to shutting-down frontend vm: notify detach
utils.detach_attached_devices_on_shutdown(self, vm, USBDevice)
if vm.uuid in self.autoattach_locks:
del self.autoattach_locks[vm.uuid]

Expand Down
21 changes: 21 additions & 0 deletions qubesusbproxy/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,27 @@ def test_023_on_startup_already_attached(self):
loop.run_until_complete(self.ext.on_domain_start(front, None))
attach_and_notify.assert_not_called()

def test_030_on_domain_shutdown_frontend(self):
# a frontend that has a usb device attached is shutting down;
# the detach event is expected
back, front = self.added_assign_setup()

exp_dev = qubesusbproxy.core3ext.USBDevice(Port(back, "1-1", "usb"))
self.ext.devices_cache = {"sys-usb": {"1-1": front}, "front-vm": {}}

loop = asyncio.get_event_loop()
with mock.patch("asyncio.ensure_future"):
loop.run_until_complete(self.ext.on_domain_shutdown(front, None))

front.fire_event_async.assert_called_with(
"device-detach:usb", port=exp_dev.port
)
self.assertEqual(
front.fire_event_async.call_args.kwargs["port"].backend_domain,
back,
)
self.assertIsNone(self.ext.devices_cache["sys-usb"]["1-1"])


def list_tests():
tests = [TC_00_USBProxy]
Expand Down