From 2124f63dcbd9d921317b0b33bf6f2942925f8a74 Mon Sep 17 00:00:00 2001
From: krishjainx <kjain7@u.rochester.edu>
Date: Tue, 12 Sep 2023 11:21:08 -0400
Subject: [PATCH] Allow use qcow2 compressed format in place of additional
 compressed layer

---
 build_library/vm_image_util.sh | 2 +-
 ci-automation/vms.sh           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index c692bff75a..36d9ff012d 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -619,7 +619,7 @@ _write_raw_disk() {
 }
 
 _write_qcow2_disk() {
-    qemu-img convert -f raw "$1" -O qcow2 -o compat=0.10 "$2"
+    qemu-img convert -f raw "$1" -O qcow2 -c -o compat=0.10 "$2"
     assert_image_size "$2" qcow2
 }
 
diff --git a/ci-automation/vms.sh b/ci-automation/vms.sh
index 310d1ab0d9..69f8fd5462 100644
--- a/ci-automation/vms.sh
+++ b/ci-automation/vms.sh
@@ -129,6 +129,8 @@ function _vm_build_impl() {
         COMPRESSION_FORMAT="bz2"
         if [[ "${format}" =~ ^(openstack|openstack_mini|digitalocean)$ ]];then
             COMPRESSION_FORMAT="gz,bz2"
+        elif [[ "${format}" =~ ^(qemu|qemu_uefi)$ ]];then
+            COMPRESSION_FORMAT="bz2,none"
         fi
         ./run_sdk_container -n "${vms_container}" -C "${packages_image}" \
             -v "${vernum}" \