Updated Branches: refs/heads/qemu-img a0b087835 -> 5e6ff4b39
srcFile can be declared once, saving us some code Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5e6ff4b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5e6ff4b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5e6ff4b3 Branch: refs/heads/qemu-img Commit: 5e6ff4b393d5bb4a833013aae99a02a9a2f93e1e Parents: 4455f1a Author: Wido den Hollander <[email protected]> Authored: Mon Feb 18 15:15:53 2013 +0100 Committer: Wido den Hollander <[email protected]> Committed: Mon Feb 18 15:15:53 2013 +0100 ---------------------------------------------------------------------- .../kvm/storage/LibvirtStorageAdaptor.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5e6ff4b3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java index b93d27c..25f2b9f 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java @@ -694,14 +694,12 @@ public class LibvirtStorageAdaptor implements StorageAdaptor { QemuImgFile destFile = null; if ((srcPool.getType() != StoragePoolType.RBD) && (destPool.getType() != StoragePoolType.RBD)) { - srcFile = new QemuImgFile(sourcePath); + srcFile = new QemuImgFile(sourcePath, sourceFormat); Map<String, String> info = qemu.info(srcFile); String backingFile = info.get(new String("backing_file")); if (sourceFormat.equals(destFormat) && backingFile == null) { Script.runSimpleBashScript("cp -f " + sourcePath + " " + destPath); - } else { - srcFile = new QemuImgFile(sourcePath, sourceFormat); destFile = new QemuImgFile(destPath, destFormat); } } else if ((srcPool.getType() != StoragePoolType.RBD) && (destPool.getType() == StoragePoolType.RBD)) {
