From 56f3d7ba7572cc9f1acb6b2f5ff6cd44ea4c6952 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sat, 1 Oct 2011 02:55:51 +0200
Subject: [PATCH] dom0+vm/qvm-block: convert device size to bytes

---
 common/block_add_change  | 2 +-
 dom0/qvm-tools/qvm-block | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/block_add_change b/common/block_add_change
index b4bd0f03..e76235ec 100755
--- a/common/block_add_change
+++ b/common/block_add_change
@@ -2,7 +2,7 @@
 
 NAME=${DEVNAME#/dev/}
 DESC="${ID_MODEL} (${ID_FS_LABEL})"
-SIZE=$(cat /sys/$DEVPATH/size)
+SIZE=$[ $(cat /sys/$DEVPATH/size) * 512 ]
 MODE=w
 XS_KEY="qubes-block-devices/$NAME"
 
diff --git a/dom0/qvm-tools/qvm-block b/dom0/qvm-tools/qvm-block
index c16c6905..66f416f2 100755
--- a/dom0/qvm-tools/qvm-block
+++ b/dom0/qvm-tools/qvm-block
@@ -107,7 +107,7 @@ def main():
             attached_to_str = ""
             if attached_to:
                 attached_to_str = " (attached to '%s' as '%s')" % (attached_to['vm'], attached_to['frontend'])
-            size_str = kbytes_to_kmg(dev['size'])
+            size_str = bytes_to_kmg(dev['size'])
             print "%s\t%s %s%s" % (dev['name'], dev['desc'], size_str, attached_to_str)
         exit (0)