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

dom0: Distinguish 'Halting','Crashed' state from simple 'Halted' (#314)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-09-13 18:39:09 +02:00
parent dbf8c11ad6
commit 0ce7336cad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom0/qvm-core/qubes.py
View File

@ -502,10 +502,10 @@ class QubesVm(object):
if dominfo: if dominfo:
if dominfo['paused']: if dominfo['paused']:
return "Paused" return "Paused"
elif dominfo['shutdown']:
return "Halted"
elif dominfo['crashed']: elif dominfo['crashed']:
return "Crashed" return "Crashed"
elif dominfo['shutdown']:
return "Halting"
elif dominfo['dying']: elif dominfo['dying']:
return "Dying" return "Dying"
else: else:
@ -988,7 +988,8 @@ class QubesVm(object):
if dry_run: if dry_run:
return return
if self.is_running(): # Intentionally not used is_running(): eliminate also "Paused", "Crashed", "Halting"
if self.get_power_state() != "Halted":
raise QubesException ("VM is already running!") raise QubesException ("VM is already running!")
if self.netvm_vm is not None: if self.netvm_vm is not None: