Skip to content

Commit 12ef850

Browse files
committed
1 parent 1334d7a commit 12ef850

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

qubesadmin/tools/qvm_device.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ def list_devices(args):
9191
for dev in result:
9292
for vm in app.domains:
9393
frontends = _load_frontends_info(vm, dev, args.devclass)
94-
if frontends is not None:
95-
result[dev].frontends.append(frontends)
94+
result[dev].frontends.extend(frontends)
9695

9796
qubesadmin.tools.print_table(prepare_table(result.values()))
9897

@@ -132,19 +131,20 @@ def _load_frontends_info(vm, dev, devclass):
132131
Returns string of vms to which a device is connected or `None`.
133132
"""
134133
if vm == dev.backend_domain:
135-
return None
134+
return
136135

137136
try:
138137
for assignment in vm.devices[devclass].get_dedicated_devices():
139138
if dev != assignment:
140-
return None
139+
continue
141140
if assignment.options:
142-
return '{!s} ({})'.format(
141+
yield '{!s} ({})'.format(
143142
vm, ', '.join('{}={}'.format(key, value)
144143
for key, value in assignment.options.items()))
145-
return str(vm)
144+
else:
145+
yield str(vm)
146146
except qubesadmin.exc.QubesVMNotFoundError:
147-
return None
147+
pass
148148

149149

150150
def attach_device(args):

0 commit comments

Comments
 (0)