Index: trunk/packages/invirt-remote/debian/changelog
===================================================================
--- trunk/packages/invirt-remote/debian/changelog	(revision 2135)
+++ trunk/packages/invirt-remote/debian/changelog	(revision 2161)
@@ -1,2 +1,8 @@
+invirt-remote (0.3.6) unstable; urgency=low
+
+  * Don't confuse KB with KiB, or MB with MiB.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 17 Feb 2009 04:58:06 -0500
+
 invirt-remote (0.3.5) unstable; urgency=low
 
Index: trunk/packages/invirt-remote/host/usr/sbin/invirt-availability
===================================================================
--- trunk/packages/invirt-remote/host/usr/sbin/invirt-availability	(revision 2135)
+++ trunk/packages/invirt-remote/host/usr/sbin/invirt-availability	(revision 2161)
@@ -9,16 +9,17 @@
 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,5 +52,5 @@
     xminfoc = yaml.load(output, yaml.CSafeLoader)
 
-    # In kilobytes
+    # In kibibytes
     dom0minmem = int(xminfoc['dom0-min-mem']) * 1024
 
Index: trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-create
===================================================================
--- trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-create	(revision 2135)
+++ trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-create	(revision 2161)
@@ -72,5 +72,5 @@
         max_memory = maxMemory(owner, vms.keys())
         if vm_memory > max_memory:
-            print >>sys.stderr, "owner %s requested %d MB of memory for vm %s; %d MB allowed" % (owner, vm_memory, machine_name, max_memory)
+            print >>sys.stderr, "owner %s requested %d MiB of memory for vm %s; %d MiB allowed" % (owner, vm_memory, machine_name, max_memory)
             return 1