diff options
| author | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-10 16:22:29 +0000 |
|---|---|---|
| committer | iap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk> | 2003-09-10 16:22:29 +0000 |
| commit | 925122e67e89b06fa66c8395481822422c0d14c3 (patch) | |
| tree | fa75b1b13528f1db0ef5ea56647a709056726386 /tools | |
| parent | e5d511f7459b4360203b35663e5aa22730630789 (diff) | |
| parent | be40ea38feb39e04d77527f78b4d0c49d11900bc (diff) | |
| download | xen-925122e67e89b06fa66c8395481822422c0d14c3.tar.gz xen-925122e67e89b06fa66c8395481822422c0d14c3.tar.bz2 xen-925122e67e89b06fa66c8395481822422c0d14c3.zip | |
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
Diffstat (limited to 'tools')
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java b/tools/control/src/org/xenoserver/cmdline/ParseDomainNew.java index ed75aa744d..6ee771914e 100644 --- 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 0288f32c98..8e276f071d 100644 --- 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 71d2efa457..5d4c0e8e41 100644 --- 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 15b39eab05..5e547a7a3b 100644 --- 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"); |