From 16f50c2862dcd524d4b788803460fd877fff9aa4 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <rohit.yadav@shapeblue.com>
Date: Fri, 5 Dec 2014 17:33:54 +0530
Subject: [PATCH] Revert "CLOUDSTACK-7959: fixed 'qemu-img convert' compat
 issue"

This reverts commit f412e07d715428b3b7d911e3cd0c71cd79949962.

Until we decide, we should keep the same 4.3 systemvm build scripts to avoid
changes in the qemu image conversion logic.
---
 tools/appliance/build.sh | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index d5fc134f28d..a9c0a0a13d8 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -90,14 +90,7 @@ set -e
 
 # Export for KVM
 vboxmanage internalcommands converttoraw -format vdi "$hdd_path" raw.img
-set +e
-qemu-img convert -o compat=0.10 -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2
-local qemuresult=$?
-set -e
-if [ ${qemuresult} != 0 ]; then
-  log INFO "'qemu-img convert' failed, trying without compat option"
-  qemu-img convert -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2
-fi
+qemu-img convert -f raw -c -O qcow2 raw.img $appliance-$build_date-$branch-kvm.qcow2
 rm raw.img
 bzip2 $appliance-$build_date-$branch-kvm.qcow2
 echo "$appliance exported for KVM: dist/$appliance-$build_date-$branch-kvm.qcow2.bz2"