xen API changes

diff --git a/debian/changelog b/debian/changelog
index aa87466..217d663 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+invirt-remote (0.4.15~glasgall7) precise; urgency=low
+
+  * Xen balloon information now lives in files in
+    /sys/devices/system/xen_memory/xen_memory0/target_kb; update
+    invirt-availability accordingly.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Wed, 24 Apr 2013 21:04:17 -0400
+

 invirt-remote (0.4.15~glasgall6) precise; urgency=low
 
   * Fix remconffs so stat() doesn't make things explode
 invirt-remote (0.4.15~glasgall6) precise; urgency=low
 
   * Fix remconffs so stat() doesn't make things explode

diff --git a/host/usr/sbin/invirt-availability b/host/usr/sbin/invirt-availability
index 1dcf9c8..3ff23a8 100644 (file)
--- a/host/usr/sbin/invirt-availability
+++ b/host/usr/sbin/invirt-availability
@@ -8,12 +8,6 @@ import sys
 import yaml
 import os
 
 import yaml
 import os
 

-# return the amount of memory in kibibytes represented by s
-def parseUnits(s):
-    num, unit = s.split(' ')
-    assert unit == 'kB', "unexpected unit"
-    return int(num)
-

 def main(argv):
     """
     Calculate the amount of memory available for new VMs
 def main(argv):
     """
     Calculate the amount of memory available for new VMs

@@ -40,10 +34,8 @@ def main(argv):
 
     free_memory = int(xminfo['free_memory']) * 1024
 
 
     free_memory = int(xminfo['free_memory']) * 1024
 

-    ballooninfo = yaml.load(open('/proc/xen/balloon', 'r').read())
-    currentallocation = parseUnits(ballooninfo['Current allocation'])
-    minimumtarget = parseUnits(ballooninfo['Minimum target'])
-
+    currentallocation = open('/sys/devices/system/xen_memory/xen_memory0/info/current_kb', 'r').read()
+    minimumtarget = open('/sys/devices/system/xen_memory/xen_memory0/target_kb', 'r').read()

     p = Popen(['/usr/sbin/xm', 'info', '-c'], stdout=PIPE)
     output = p.communicate()[0]
     if p.returncode != 0:
     p = Popen(['/usr/sbin/xm', 'info', '-c'], stdout=PIPE)
     output = p.communicate()[0]
     if p.returncode != 0: