Changeset 2161 for trunk/packages/invirt-remote/host

Timestamp:

Feb 17, 2009, 5:01:23 AM (16 years ago)

Author:

andersk

Message:

Don't confuse {KB, MB, GB} with {KiB, MiB, GiB}.

File:

• trunk/packages/invirt-remote/host/usr/sbin/invirt-availability (modified) (2 diffs)

trunk/packages/invirt-remote/host/usr/sbin/invirt-availability

@@ -9 +9 @@
 import os
 
-# return the amount of memory in kilobytes represented by s
+# return the amount of memory in kibibytes represented by s
 def parseUnits(s):
     num, unit = s.split(' ')
-    return int(num) * {'kb':1, 'mb':1024}[unit.lower()]
+    assert unit == 'kB', "unexpected unit"
+    return int(num)
 
 def main(argv):
     """
     Calculate the amount of memory available for new VMs
-    The numbers returned by xm info and xm info -c are in MB
-    The numbers in /proc/xen/balloon have nice units
-    All math is done in kilobytes for consistency
-    Output is in MB
+    The numbers returned by xm info and xm info -c are in MiB
+    The numbers in /proc/xen/balloon are in KiB
+    All math is done in kibibytes for consistency
+    Output is in MiB
 
     Bail if /etc/invirt/nocreate exists
@@ -51 +52 @@
     xminfoc = yaml.load(output, yaml.CSafeLoader)
 
-    # In kilobytes
+    # In kibibytes
     dom0minmem = int(xminfoc['dom0-min-mem']) * 1024