pool/libvirt
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- util: Fix logic in virFileSetCOW

Browse Source 
2edd63a0-fix-virFileSetCOW-logic.patch
  boo#1175463

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=836
This commit is contained in:
James Fehlig 2020-08-18 21:42:51 +00:00 committed by Git OBS Bridge
parent f35b0fae10
commit a309351b09
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
2edd63a0-fix-virFileSetCOW-logic.patch Normal file
View File

@ -0,0 +1,29 @@
commit 2edd63a0dbd445112db23596ee0128521e8f1ff5
Author: Jiri Denemark <jdenemar@redhat.com>
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 <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
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);

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Aug 18 21:40:48 UTC 2020 - James Fehlig <jfehlig@suse.com>
- util: Fix logic in virFileSetCOW
2edd63a0-fix-virFileSetCOW-logic.patch
boo#1175463
-------------------------------------------------------------------
Tue Aug 4 22:46:13 UTC 2020 - James Fehlig <jfehlig@suse.com>

2
libvirt.spec
View File

@ -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