Fix serialization of domain states

qubesdbus/domain_manager.py

@@ -61,10 +61,11 @@ def __init__(self, qubes_data: DBusProperties, domains: List[DBusProperties]) ->
         self.managed_objects = [self._proxify_domain(vm) for vm in domains]
         self.state_signals = {
             'Starting': self.Starting,
-            'Running' : self.Started,
+            'Started' : self.Started,
             'Failed'  : self.Failed,
             'Halting' : self.Halting,
             'Halted'  : self.Halted,
+            'Unknown' : lambda _, __: None,
         }
         self.signal_matches = {} # type: Dict[dbus.ObjectPath, List[DBusSignalMatch]]
 

qubesdbus/serialize.py

@@ -55,6 +55,21 @@ def qubes_data(app):
     return result
 
 
+def serialize_state(state):
+    state = state.lower()
+    if state == 'crashed':
+        return 'Failed'
+    elif state in ['transient', 'na']:
+        return 'Unknown'
+    elif state == 'halted':
+        return 'Halted'
+    elif state == 'transient':
+        return 'Starting'
+    elif state == 'running':
+        return 'Started'
+    else:
+        return '=>%s<=' % state
+
 def domain_data(vm):
     ''' Serializes a `qubes.vm.qubesvm.QubesVM` to a dictionary '''
     # type: (QubesVM) -> Dict[dbus.String, Any]
@@ -68,7 +83,7 @@ def domain_data(vm):
         result[name] = value
 
     # Additional data
-    result['state'] = serialize_val(vm.get_power_state())
+    result['state'] = serialize_state(vm.get_power_state())
     result['networked'] = serialize_val(vm.is_networked())
     return result