X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/blobdiff_plain/ec9f34912b12e2e15f70b796e98a6ad53d4e336a..dfa345127ad532b97f02978373f1489e5fbf0bcd:/files/usr/sbin/sipb-xen-listvms

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 427a586..04dfc20 100755
--- 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
@@ -35,8 +38,12 @@ def get_dom(domid):
 
 if __name__ == '__main__':
     vms = live_vms()
-    if '--pickle' in sys.argv[1:]:
+    if '--json' in sys.argv[1:]:
+        import cjson
+        print cjson.encode(vms)
+    elif '--pickle' in sys.argv[1:]:
         import cPickle
         cPickle.dump(vms, sys.stdout, cPickle.HIGHEST_PROTOCOL)
     else:
-        print vms
+        import yaml
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)