Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/qvm-ls: adjust VM classes

Browse Source 
QubesOS/qubes-issues#853
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-28 01:41:13 +01:00
parent 554081498d
commit fea3d3391f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qubesmgmt/tools/qvm_ls.py
View File

@ -34,7 +34,7 @@ import textwrap
import qubesmgmt
import qubesmgmt.tools
import qubesmgmt.utils
import qubesmgmt.vm
#
# columns
@ -217,27 +217,18 @@ class StatusColumn(Column):
When it is HVM (optimised VM), the letter is capital.
'''
# late import because of circular dependency
# pylint: disable=redefined-outer-name
import qubes.vm
import qubes.vm.adminvm
import qubes.vm.appvm
import qubes.vm.dispvm
import qubes.vm.qubesvm
import qubes.vm.templatevm
if isinstance(vm, qubes.vm.adminvm.AdminVM):
if isinstance(vm, qubesmgmt.vm.AdminVM):
return '0'
ret = None
# TODO right order, depending on inheritance
if isinstance(vm, qubes.vm.templatevm.TemplateVM):
if isinstance(vm, qubesmgmt.vm.TemplateVM):
ret = 't'
if isinstance(vm, qubes.vm.appvm.AppVM):
if isinstance(vm, qubesmgmt.vm.AppVM):
ret = 'a'
# if isinstance(vm, qubes.vm.standalonevm.StandaloneVM):
# ret = 's'
if isinstance(vm, qubes.vm.dispvm.DispVM):
if isinstance(vm, qubesmgmt.vm.StandaloneVM):
ret = 's'
if isinstance(vm, qubesmgmt.vm.DispVM):
ret = 'd'
if ret is not None: