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/18 18:21:25 UTC
[37/38] git commit: refs/heads/qemu-img - Fix a compile issue
Fix a compile issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4455f1a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4455f1a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4455f1a1
Branch: refs/heads/qemu-img
Commit: 4455f1a19434a5587d6c628a4f2e8df4feb1a7fc
Parents: 0db51b3
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Feb 18 15:14:53 2013 +0100
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Mon Feb 18 15:14:53 2013 +0100
----------------------------------------------------------------------
.../kvm/storage/LibvirtStorageAdaptor.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4455f1a1/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 41ce76f..b93d27c 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
@@ -695,9 +695,9 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
if ((srcPool.getType() != StoragePoolType.RBD) && (destPool.getType() != StoragePoolType.RBD)) {
srcFile = new QemuImgFile(sourcePath);
- Map<String, String> info = Qemu.info(srcFile);
+ Map<String, String> info = qemu.info(srcFile);
String backingFile = info.get(new String("backing_file"));
- if (sourceFormat.equals(destFormat) && !backingFile) {
+ if (sourceFormat.equals(destFormat) && backingFile == null) {
Script.runSimpleBashScript("cp -f " + sourcePath + " " + destPath);
} else {