From bc1b3e59a7c8e4c3efb28888cce9acfe146fb5e8 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrangé <berrange@redhat.com>
Date: Aug 21 2020 10:47:16 +0000
Subject: Fix creation of pools on non-btrfs (rhbz#1870197)


Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

---

diff --git a/0001-util-Fix-logic-in-virFileSetCOW.patch b/0001-util-Fix-logic-in-virFileSetCOW.patch
new file mode 100644
index 0000000..db9737d
--- /dev/null
+++ b/0001-util-Fix-logic-in-virFileSetCOW.patch
@@ -0,0 +1,37 @@
+From 2edd63a0dbd445112db23596ee0128521e8f1ff5 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 5 Aug 2020 10:01:45 +0200
+Subject: [libvirt PATCH] util: Fix logic in virFileSetCOW
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When COW is not explicitly requested to be disabled or enabled, the
+function is supposed to do nothing on non-BTRFS file systems.
+
+Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1866157
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/util/virfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index 6ada3a708c..7f22884b07 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -4522,7 +4522,7 @@ virFileSetCOW(const char *path,
+     }
+ 
+     if (buf.f_type != BTRFS_SUPER_MAGIC) {
+-        if (state == VIR_TRISTATE_BOOL_ABSENT) {
++        if (state != VIR_TRISTATE_BOOL_ABSENT) {
+             virReportSystemError(ENOSYS,
+                                  _("unable to control COW flag on '%s', not btrfs"),
+                                  path);
+-- 
+2.26.2
+
diff --git a/libvirt.spec b/libvirt.spec
index 0a95814..efbce13 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -218,7 +218,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 6.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -226,6 +226,7 @@ URL: https://libvirt.org/
     %define mainturl stable_updates/
 %endif
 Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
+Patch1: 0001-util-Fix-logic-in-virFileSetCOW.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -1994,6 +1995,9 @@ exit 0
 
 
 %changelog
+* Fri Aug 21 2020 Daniel P. Berrangé <berrange@redhat.com> - 6.6.0-2
+- Fix creation of pools on non-btrfs (rhbz#1870197)
+
 * Tue Aug 04 2020 Cole Robinson <crobinso@redhat.com> - 6.6.0-1
 - Update to version 6.6.0