You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2012/10/12 04:25:50 UTC

[19/50] git commit: KVM: removes check for 'snapshot' text in qemu-img --help output

KVM: removes check for 'snapshot' text in qemu-img --help output

Signed-off-by: Edison Su <su...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/653889dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/653889dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/653889dc

Branch: refs/heads/javelin
Commit: 653889dc4dfb9a2d4b1e7c2cf6cb2d1f7c7eda45
Parents: 436960d
Author: Marcus Sorensen <sh...@gmail.com>
Authored: Fri Oct 5 17:58:12 2012 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Fri Oct 5 17:58:12 2012 -0700

----------------------------------------------------------------------
 .../kvm/resource/LibvirtComputingResource.java     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/653889dc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index f6a6494..1bc70fa 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -4304,7 +4304,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
 
     /* online snapshot supported by enhanced qemu-kvm */
     private boolean isSnapshotSupported() {
-        String result = executeBashScript("qemu-img --help|grep convert |grep snapshot");
+        String result = executeBashScript("qemu-img --help|grep convert");
         if (result != null) {
             return false;
         } else {