bitkeeper revision 1.418.1.3 (3f5f4ef89JHlK6hg-7GOnZB0sTrang)

Many files:
  Allow + syntax on phy partitions

diff --git a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
index ed75aa744d8bc067a44e1620b9357bad787838ee..6ee771914e48171522d54d301c5b21b71751b8de 100644 (file)
--- a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java
+++ b/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);

diff --git a/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java b/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java
index 0288f32c98fbe490198cc7aa3ff07a09f85c0922..8e276f071d048848513a2c02b767b74b315cd252 100644 (file)
--- a/tools/control/src/org/xenoserver/control/CommandPhysicalGrant.java
+++ b/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.");

diff --git a/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java b/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java
index 71d2efa457c51ac33183795ebbd1a328d77b7a21..5d4c0e8e416afd2e68bc361f0c364c8a98c11204 100644 (file)
--- a/tools/control/src/org/xenoserver/control/CommandPhysicalRevoke.java
+++ b/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(

diff --git a/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java b/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java
index 15b39eab05563094cdb4b00b88a858999841fb62..5e547a7a3b40625459285caa96ec765aabd7f3bb 100644 (file)
--- a/tools/control/src/org/xenoserver/control/CommandVbdCreatePhysical.java
+++ b/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");