[PR PATCH] libvirt: apply upstream patch to fix non-brtfs fs

[PR PATCH] libvirt: apply upstream patch to fix non-brtfs fs

[abenson]

[-- Attachment #1: Type: text/plain, Size: 352 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages libvirt_fix-virFileSetCOW
https://github.com/void-linux/void-packages/pull/24346

libvirt: apply upstream patch to fix non-brtfs fs


A patch file from https://github.com/void-linux/void-packages/pull/24346.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libvirt_fix-virFileSetCOW-24346.patch --]
[-- Type: text/x-diff, Size: 2045 bytes --]

From 284fb2060bd44d710626aa5cd824437c70891d11 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 18 Aug 2020 14:34:45 -0500
Subject: [PATCH] libvirt: apply upstream patch to fix non-brtfs fs

---
 .../libvirt/patches/fix-virFileSetCOW.patch   | 27 +++++++++++++++++++
 srcpkgs/libvirt/template                      |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvirt/patches/fix-virFileSetCOW.patch

diff --git a/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch b/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
new file mode 100644
index 00000000000..a0fc0786dec
--- /dev/null
+++ b/srcpkgs/libvirt/patches/fix-virFileSetCOW.patch
@@ -0,0 +1,27 @@
+https://www.redhat.com/archives/libvir-list/2020-August/msg00259.html
+
+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>
+---
+ src/util/virfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/util/virfile.c src/util/virfile.c
+index 6ada3a708c..7f22884b07 100644
+--- src/util/virfile.c
++++ 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);
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index d04f053fb7b..470165f1527 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=6.6.0
-revision=1
+revision=2
 build_wrksrc="build"
 build_style=gnu-configure
 configure_script="../configure"

Re: libvirt: apply upstream patch to fix non-brtfs fs

[abenson]

[-- Attachment #1: Type: text/plain, Size: 156 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/24346#issuecomment-675679455

Comment:
Fix for #24347 

Re: [PR PATCH] [Merged]: libvirt: apply upstream patch to fix non-brtfs fs

[abenson]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

There's a merged pull request on the void-packages repository

libvirt: apply upstream patch to fix non-brtfs fs
https://github.com/void-linux/void-packages/pull/24346

Description: