fix a race in listvms when a machine is shutting down

[invirt/packages/invirt-remote.git] / files / usr / sbin / sipb-xen-listvms

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 8b78b22..04dfc20 100755 (executable)
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -14,7 +14,10 @@ def live_vms():
     vms = dict()
 
     for domid in domids:
-        name, data = get_dom(int(domid))
+        try:
+            name, data = get_dom(int(domid))
+        except TypeError:
+            continue # went down since we started
         if name.startswith('d_'):
             name = name[2:]
             vms[name] = data
@@ -43,4 +46,4 @@ if __name__ == '__main__':
         cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
     else:
         import yaml
-        print yaml.safe_dump(vms, default_flow_style=False)
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)