diff --git a/2edd63a0-fix-virFileSetCOW-logic.patch b/2edd63a0-fix-virFileSetCOW-logic.patch new file mode 100644 index 0000000..5093a75 --- /dev/null +++ b/2edd63a0-fix-virFileSetCOW-logic.patch @@ -0,0 +1,29 @@ +commit 2edd63a0dbd445112db23596ee0128521e8f1ff5 +Author: Jiri Denemark +Date: Wed Aug 5 10:01:45 2020 +0200 + + util: Fix logic in virFileSetCOW + + 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 + Reviewed-by: Daniel P. Berrangé + +Index: libvirt-6.6.0/src/util/virfile.c +=================================================================== +--- libvirt-6.6.0.orig/src/util/virfile.c ++++ libvirt-6.6.0/src/util/virfile.c +@@ -4550,7 +4550,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); diff --git a/libvirt.changes b/libvirt.changes index 0d9b32b..2685827 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 18 21:40:48 UTC 2020 - James Fehlig + +- util: Fix logic in virFileSetCOW + 2edd63a0-fix-virFileSetCOW-logic.patch + boo#1175463 + ------------------------------------------------------------------- Tue Aug 4 22:46:13 UTC 2020 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index 841a14a..357d417 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -336,6 +336,7 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches +Patch0: 2edd63a0-fix-virFileSetCOW-logic.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -875,6 +876,7 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1