You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/25 15:44:57 UTC
[28/28] git commit: refs/heads/qemu-img - Remove a redundant convert
method
Updated Branches:
refs/heads/qemu-img c08e1bd09 -> d93582d0a
Remove a redundant convert method
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d93582d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d93582d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d93582d0
Branch: refs/heads/qemu-img
Commit: d93582d0aa92cee12fe68326ab3a70763d26ff75
Parents: 2e2750f
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Feb 25 15:16:59 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Feb 25 15:16:59 2013 +0100
----------------------------------------------------------------------
.../kvm/storage/LibvirtStorageAdaptor.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d93582d0/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 25f2b9f..fb56c86 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
@@ -621,7 +621,6 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
if (srcPool.getType() != StoragePoolType.RBD) {
srcFile = new QemuImgFile(template.getPath(), template.getFormat());
- qemu.convert(srcFile, destFile);
} else {
template.setFormat(PhysicalDiskFormat.RAW);
srcFile = new QemuImgFile(KVMPhysicalDisk.RBDStringBuilder(srcPool.getSourceHost(),
@@ -630,8 +629,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
srcPool.getAuthSecret(),
template.getPath()));
srcFile.setFormat(template.getFormat());
- qemu.convert(srcFile, destFile);
}
+ qemu.convert(srcFile, destFile);
}
return disk;
}