From 414be0945dc2c98bb7e0ddcf5bffe187faee9705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 9 Aug 2017 04:03:47 +0200 Subject: [PATCH] tools/qvm-device: list attach options --- qubesadmin/tools/qvm_device.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qubesadmin/tools/qvm_device.py b/qubesadmin/tools/qvm_device.py index 653ec19..815f962 100644 --- a/qubesadmin/tools/qvm_device.py +++ b/qubesadmin/tools/qvm_device.py @@ -99,9 +99,15 @@ def list_devices(args): if domain == dev.backend_domain: continue - if dev in domain.devices[args.devclass].assignments(): - result[dev].frontends.append(str(domain)) - + for assignment in domain.devices[args.devclass].assignments(): + if dev != assignment: + continue + if assignment.options: + result[dev].frontends.append('{!s} ({})'.format( + domain, ', '.join('{}={}'.format(key, value) + for key, value in assignment.options.items()))) + else: + result[dev].frontends.append(str(domain)) qubesadmin.tools.print_table(prepare_table(result.values()))