Ac 98 updated qemu support (#33)

* Adding new -U option for qemu-img into strategic locations

* Fixing typo'd paths

Author: nlgordon

plugins/hypervisors/kvm/src/org/apache/cloudstack/utils/qemu/QemuImg.java

@@ -20,6 +20,8 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import org.libvirt.LibvirtException;
 import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import com.cloud.storage.Storage;
@@ -226,6 +228,9 @@ public void create(final QemuImgFile file, final Map<String, String> options) th
     public void convert(final QemuImgFile srcFile, final QemuImgFile destFile, final Map<String, String> options) throws QemuImgException {
         final Script script = new Script(_qemuImgPath, timeout);
         script.add("convert");
+
+        includeForceShared(script);
+
         // autodetect source format. Sometime int he future we may teach KVMPhysicalDisk about more formats, then we can explicitly pass them if necessary
         //s.add("-f");
         //s.add(srcFile.getFormat().toString());
@@ -304,6 +309,9 @@ public void commit(final QemuImgFile file) throws QemuImgException {
     public Map<String, String> info(final QemuImgFile file) throws QemuImgException {
         final Script s = new Script(_qemuImgPath);
         s.add("info");
+
+        includeForceShared(s);
+
         s.add(file.getFileName());
         final OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
         final String result = s.execute(parser);
@@ -331,6 +339,16 @@ public Map<String, String> info(final QemuImgFile file) throws QemuImgException
         return info;
     }
 
+    private void includeForceShared(Script s) {
+        try {
+            long version = LibvirtConnection.getConnection().getVersion();
+            if (version >= 2010000) {
+                s.add("-U");
+            }
+        } catch (LibvirtException ignored) {
+        }
+    }
+
     /* List, apply, create or delete snapshots in image */
     public void snapshot() throws QemuImgException {
 

scripts/storage/qcow2/managesnapshot.sh

@@ -215,15 +215,23 @@ backup_snapshot() {
      ( printf "${qemu_img} failed to create backup of snapshot ${snapshotname} for disk ${disk} to ${destPath}.\n" >&2; return 2 )
 
   elif [ -f ${disk} ]; then
+
+    # Localizing this to just this branch since it is specific to our setup
+    local forceSharedWrite=""
+    if $qemu_img -h | grep '\[-U]' >& /dev/null
+    then
+      forceSharedWrite="-U"
+    fi
+
     # Does the snapshot exist?
-    $qemu_img snapshot -l $disk|grep -w "$snapshotname" >& /dev/null
+    $qemu_img snapshot $forceSharedWrite -l $disk|grep -w "$snapshotname" >& /dev/null
     if [ $? -gt 0 ]
     then
       printf "there is no $snapshotname on disk $disk\n" >&2
       return 1
     fi
 
-    $qemu_img convert -f qcow2 -O qcow2 -s $snapshotname $disk $destPath/$destName >& /dev/null
+    $qemu_img convert $forceSharedWrite -f qcow2 -O qcow2 -s $snapshotname $disk $destPath/$destName >& /dev/null
     if [ $? -gt 0 ]
     then
       printf "Failed to backup $snapshotname for disk $disk to $destPath\n" >&2

scripts/storage/qcow2/resizevolume.sh

@@ -178,7 +178,14 @@ resizeqcow2() {
   fi
   ##### end sanity #####
 
-  actualsize=`qemu-img info $path | grep "virtual size" | sed -re  's/^.*\(([0-9]+).*$/\1/g'`
+  # Localizing this to just this branch since it is specific to our setup
+  local forceSharedWrite=""
+  if qemu-img -h | grep '\[-U]' >& /dev/null
+  then
+    forceSharedWrite="-U"
+  fi
+
+  actualsize=`qemu-img info $forceSharedWrite $path | grep "virtual size" | sed -re  's/^.*\(([0-9]+).*$/\1/g'`
 
   if [ $actualsize -ne $currentsize ]
   then