ia64/xen-unstable

changeset 712:b78116ab99cf

bitkeeper revision 1.422 (3f5f4fc5QhKVc6v-Trd3jAv-sM19pA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/tlh20/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Wed Sep 10 16:22:29 2003 +0000 (2003-09-10)
parents 2266cd4dd7ec 79f86eafbcdd
children 0dd18b6d0c08
files tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java
line diff
     1.1 --- a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Wed Sep 10 16:22:25 2003 +0000
     1.2 +++ b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java	Wed Sep 10 16:22:29 2003 +0000
     1.3 @@ -62,7 +62,7 @@ public class ParseDomainNew extends Comm
     1.4              }
     1.5          }
     1.6          
     1.7 -        if (usr_dev != null && (usr_dev.startsWith("/dev/sda")) || usr_dev.startsWith("/dev/hda")) {
     1.8 +        if (usr_dev != null && ((usr_dev.startsWith("/dev/sda")) || usr_dev.startsWith("/dev/hda"))) {
     1.9              String real_usr = StringPattern.parse(usr_dev).resolve(c.domain_id());
    1.10              String device = real_usr.substring(real_usr.indexOf('/',1)+1);
    1.11              CommandPhysicalGrant cg = new CommandPhysicalGrant(d,c.domain_id(),device,Mode.READ_ONLY,false);
     2.1 --- a/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java	Wed Sep 10 16:22:25 2003 +0000
     2.2 +++ b/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java	Wed Sep 10 16:22:29 2003 +0000
     2.3 @@ -43,7 +43,7 @@ public class CommandPhysicalGrant extend
     2.4          Runtime r = Runtime.getRuntime();
     2.5          String output = null;
     2.6  
     2.7 -        Partition partition = PartitionManager.IT.getPartition(partition_name);
     2.8 +        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
     2.9      
    2.10          if ( partition == null ) {
    2.11            throw new CommandFailedException("Partition " + partition_name + " does not exist.");
     3.1 --- a/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java	Wed Sep 10 16:22:25 2003 +0000
     3.2 +++ b/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java	Wed Sep 10 16:22:29 2003 +0000
     3.3 @@ -30,7 +30,7 @@ public class CommandPhysicalRevoke exten
     3.4          Runtime r = Runtime.getRuntime();
     3.5          String output = null;
     3.6  
     3.7 -        Partition partition = PartitionManager.IT.getPartition(partition_name);
     3.8 +        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
     3.9  
    3.10          if (partition == null) {
    3.11              throw new CommandFailedException(
     4.1 --- a/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java	Wed Sep 10 16:22:25 2003 +0000
     4.2 +++ b/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java	Wed Sep 10 16:22:29 2003 +0000
     4.3 @@ -38,7 +38,7 @@ public class CommandVbdCreatePhysical ex
     4.4       * @see org.xenoserver.control.Command#execute()
     4.5       */
     4.6      public String execute() throws CommandFailedException {
     4.7 -        Partition partition = PartitionManager.IT.getPartition(partition_name);
     4.8 +        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
     4.9          if (partition == null) {
    4.10              throw new CommandFailedException(
    4.11                  "No partition " + partition_name + " exists");