From 8867a28c960126b75d63ee554f194ae080939f14 Mon Sep 17 00:00:00 2001
From: "ach61@soar.cl.cam.ac.uk" <ach61@soar.cl.cam.ac.uk>
Date: Mon, 28 Apr 2003 14:30:52 +0000
Subject: bitkeeper revision 1.189 (3ead3b1cS7oGt_c65vuKxevku1phmQ)

use long instead of int for disk sizes
change default state file
---
 tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java          | 4 ++--
 tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java             | 4 ++--
 tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java      | 2 +-
 .../vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java | 4 ++--
 tools/vdmanager/vdmanager                                             | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tools')

diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
index 0709376294..70d8ed882d 100755
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Library.java
@@ -59,7 +59,7 @@ Library
    * convert a number (string format) into 
    * the corresponding integer value.
    */
-  static int
+  static long
   parse_size(String size)
   {
     String substring = size;
@@ -94,7 +94,7 @@ Library
       substring = size;
     }
 
-    return Integer.decode(substring).intValue() * suffix;
+    return Long.decode(substring).longValue() * suffix;
   }
 
   static String
diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
index 2a036bbe9c..2110521bcb 100755
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/Main.java
@@ -10,8 +10,8 @@ import java.util.Date;
 public class
 Main
 {
-  static String state_filename_in  = "/var/run/vdmanager.xml";
-  static String state_filename_out = "/var/run/vdmanager.xml";
+  static String state_filename_in  = "/var/lib/xen/vdstate.xml";
+  static String state_filename_out = "/var/lib/xen/vdstate.xml";
   static String partition_filename = "/proc/partitions";
 
   void
diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
index 72d5bb9441..0e529edfa2 100755
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.java
@@ -189,7 +189,7 @@ VirtualDisk
    */
 
   void
-  add_new_partition (Partition partition, int size)
+  add_new_partition (Partition partition, long size)
   {
     int loop;
 
diff --git a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
index eeaa156414..6d5877da2d 100755
--- a/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
+++ b/tools/vdmanager/src/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.java
@@ -35,7 +35,7 @@ VirtualDiskManager
   }
 
   public void
-  add_xeno_partition (Partition partition, int size)
+  add_xeno_partition (Partition partition, long size)
   {
     free.add_new_partition (partition, size);
     return;
@@ -46,7 +46,7 @@ VirtualDiskManager
    */
 
   public VirtualDisk
-  create_virtual_disk(String name, int size, Date expiry)
+  create_virtual_disk(String name, long size, Date expiry)
   {
     VirtualDisk vd = new VirtualDisk (name, expiry);
 
diff --git a/tools/vdmanager/vdmanager b/tools/vdmanager/vdmanager
index e58562496b..6ecaa197d9 100755
--- a/tools/vdmanager/vdmanager
+++ b/tools/vdmanager/vdmanager
@@ -8,9 +8,9 @@ export PATH=${ANT_HOME}/bin:${JAVA_HOME}/bin:${PATH}
 # runtime
 export JAVA_HOME=../jre-1.4.1
 export PATH=${JAVA_HOME}/bin:${PATH}
-if [ -f /var/run/vdmanager.xml ]
+if [ -f /var/lib/xen/vdstate.xml ]
 then
-  cp /var/run/vdmanager.xml /var/run/vdmanager.old.xml
+  cp /var/lib/xen/vdstate.xml /var/lib/xen/vdstate.old.xml
 fi
 
 java -jar vdmanager.jar $*
-- 
cgit v1.2.3