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

diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/sipb-xen-listvms
index 34cff0e..04dfc20 100755
--- a/files/usr/sbin/sipb-xen-listvms
+++ b/files/usr/sbin/sipb-xen-listvms
@@ -4,7 +4,6 @@ import sys
 import time
 sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python')
 from xen.lowlevel.xs import xs
-import yaml
 
 trans = xs()
 
@@ -15,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
@@ -36,4 +38,12 @@ def get_dom(domid):
 
 if __name__ == '__main__':
     vms = live_vms()
-    print yaml.safe_dump(vms, default_flow_style=False)
+    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:
+        import yaml
+        print yaml.dump(vms, Dumper=yaml.CSafeDumper, default_flow_style=False)