Index: trunk/packages/xvm-munin-config/debian/changelog
===================================================================
--- trunk/packages/xvm-munin-config/debian/changelog	(revision 1782)
+++ trunk/packages/xvm-munin-config/debian/changelog	(revision 1783)
@@ -5,4 +5,5 @@
   * Bump theoretical CPU max to 64x
   * Show domain CPU weight and cap if available
+  * Refuse to run with the untested SERVER_XEN_API until we support it elsewhere
 
   [ Evan Broder ]
@@ -11,5 +12,5 @@
     preinst will get run on upgrade
 
- -- Evan Broder <broder@mit.edu>  Tue, 25 Nov 2008 23:14:07 -0500
+ -- Quentin Smith <quentin@mit.edu>  Tue, 25 Nov 2008 23:44:22 -0500
 
 xvm-munin-config (0.0.4) unstable; urgency=low
Index: trunk/packages/xvm-munin-config/host/usr/share/xvm-munin-host-config/plugins/xen_cpu
===================================================================
--- trunk/packages/xvm-munin-config/host/usr/share/xvm-munin-host-config/plugins/xen_cpu	(revision 1782)
+++ trunk/packages/xvm-munin-config/host/usr/share/xvm-munin-host-config/plugins/xen_cpu	(revision 1783)
@@ -4,6 +4,11 @@
 from xen.xend import sxp
 import atexit
+import sys
 
 serverType, serverURI = parseServer()
+
+if serverType != SERVER_LEGACY_XMLRPC:
+    print >>sys.stderr, "xen_cpu is untested with this Xen server type"
+    sys.exit(1)
 
 if serverType == SERVER_XEN_API:
@@ -21,6 +26,4 @@
     from xen.util.xmlrpcclient import ServerProxy
     server = ServerProxy(serverURI)
-
-import sys
 
 if len(sys.argv) > 1: