Merge ~paelzer/ubuntu/+source/virt-manager:lp-1847105-fix-slow-alloc-FOCAL into ubuntu/+source/virt-manager:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4277/+packages
Bug: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1847105

[Robie Basak (racb)]

review: Approve (sru)

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/virt-manager
 * [new tag] upload/1%2.2.1-3ubuntu2.1 -> upload/1%2.2.1-3ubuntu2.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading virt-manager_2.2.1-3ubuntu2.1.dsc: done.
  Uploading virt-manager_2.2.1-3ubuntu2.1.debian.tar.xz: done.
  Uploading virt-manager_2.2.1-3ubuntu2.1_source.buildinfo: done.
  Uploading virt-manager_2.2.1-3ubuntu2.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index ac7ac09..7c7e88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+virt-manager (1:2.2.1-3ubuntu2.1) focal; urgency=medium
+
+  * d/p/lp-1847105-addstorage-Return-to-using-qcow2-sparse-by-default.patch:
+    fix slow disk allocation when using the defaults to to falloc (LP: #1847105)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 23 Sep 2020 07:19:04 +0200
+
 virt-manager (1:2.2.1-3ubuntu2) focal; urgency=medium
 
   * Fix legacy-images path for focal. LP: #1872941
diff --git a/debian/patches/lp-1847105-addstorage-Return-to-using-qcow2-sparse-by-default.patch b/debian/patches/lp-1847105-addstorage-Return-to-using-qcow2-sparse-by-default.patch
new file mode 100644
index 0000000..6e0a85b
--- /dev/null
+++ b/debian/patches/lp-1847105-addstorage-Return-to-using-qcow2-sparse-by-default.patch
@@ -0,0 +1,55 @@
+From ba08f84b3408744e9aa9763d100e8aa217c1f5ff Mon Sep 17 00:00:00 2001
+From: Cole Robinson <[e-mail]>
+Date: Sat, 19 Sep 2020 18:06:45 -0400
+Subject: [PATCH] addstorage: Return to using qcow2 sparse by default
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1759454
+
+See 15a6a7e2105440df528f75c4df4d2471df28bd1e
+
+The idea behind virt-manager's sparse vs nonsparse default, is that if
+the user selected 'raw' for as the default image format, assume they
+want to maximize performance, so fully allocate the disk.
+
+qcow2 didn't support anything except sparse, so the sparse=True vs
+sparse=False made no difference. So we always set sparse=False
+
+Then qcow2 grows non-sparse support, and virt-manager is suddenly
+defaulting to it, which is not the intention.
+
+Default to sparse when requested format isn't raw
+
+Signed-off-by: Cole Robinson <[e-mail]>
+
+Backport-Note: upstream also changed some tests not existing in groovy
+Origin: upstream, https://github.com/virt-manager/virt-manager/commit/ba08f84b34
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1847105
+Last-Update: 2020-09-21
+
+---
+ virtManager/device/addstorage.py  | 8 ++++++--
+ 3 files changed, 11 insertions(+), 11 deletions(-)
+
+--- a/virtManager/device/addstorage.py
++++ b/virtManager/device/addstorage.py
+@@ -176,14 +176,18 @@ class vmmAddStorage(vmmGObjectUI):
+         if disk.wants_storage_creation():
+             pool = disk.get_parent_pool()
+             size = uiutil.spin_get_helper(self.widget("storage-size"))
+-            sparse = False
++            fmt = self.conn.get_default_storage_format()
++
++            # If the user changed the default disk format to raw, assume
++            # they want to maximize performance, so fully allocate the
++            # disk image. Otherwise use sparse
++            sparse = fmt != 'raw'
+ 
+             vol_install = virtinst.DeviceDisk.build_vol_install(
+                 disk.conn, os.path.basename(disk.path), pool,
+                 size, sparse)
+             disk.set_vol_install(vol_install)
+ 
+-            fmt = self.conn.get_default_storage_format()
+             if disk.get_vol_install().supports_format():
+                 log.debug("Using default prefs format=%s for path=%s",
+                     fmt, disk.path)
diff --git a/debian/patches/series b/debian/patches/series
index 06e24c9..9bb79e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Use-usr-bin-python.patch
 mark-libvirt-lxc.patch
 legacy-images.patch
+lp-1847105-addstorage-Return-to-using-qcow2-sparse-by-default.patch