bitkeeper revision 1.418.1.3 (3f5f4ef89JHlK6hg-7GOnZB0sTrang)

Many files:
  Allow + syntax on phy partitions

tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java

@@ -62,7 +62,7 @@ public class ParseDomainNew extends CommandParser {
             }
         }
         
-        if (usr_dev != null && (usr_dev.startsWith("/dev/sda")) || usr_dev.startsWith("/dev/hda")) {
+        if (usr_dev != null && ((usr_dev.startsWith("/dev/sda")) || usr_dev.startsWith("/dev/hda"))) {
             String real_usr = StringPattern.parse(usr_dev).resolve(c.domain_id());
             String device = real_usr.substring(real_usr.indexOf('/',1)+1);
             CommandPhysicalGrant cg = new CommandPhysicalGrant(d,c.domain_id(),device,Mode.READ_ONLY,false);

tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java

@@ -43,7 +43,7 @@ public class CommandPhysicalGrant extends Command {
         Runtime r = Runtime.getRuntime();
         String output = null;
 
-        Partition partition = PartitionManager.IT.getPartition(partition_name);
+        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
     
         if ( partition == null ) {
           throw new CommandFailedException("Partition " + partition_name + " does not exist.");

tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java

@@ -30,7 +30,7 @@ public class CommandPhysicalRevoke extends Command {
         Runtime r = Runtime.getRuntime();
         String output = null;
 
-        Partition partition = PartitionManager.IT.getPartition(partition_name);
+        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
 
         if (partition == null) {
             throw new CommandFailedException(

tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java

@@ -38,7 +38,7 @@ public class CommandVbdCreatePhysical extends Command {
      * @see org.xenoserver.control.Command#execute()
      */
     public String execute() throws CommandFailedException {
-        Partition partition = PartitionManager.IT.getPartition(partition_name);
+        Partition partition = PartitionManager.IT.getPartition(StringPattern.parse(partition_name).resolve(domain_id));
         if (partition == null) {
             throw new CommandFailedException(
                 "No partition " + partition_name + " exists");