Add patch to fix detection of qemu mandatory locking.

This commit is contained in:
Richard W.M. Jones 2018-03-29 20:22:28 +01:00
parent 02bf5b3c16
commit f034e58d54
2 changed files with 36 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From e79286f71738d9385157d9e87211be02645722c3 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 29 Mar 2018 20:18:34 +0100
Subject: [PATCH] qemu: Fix transcription error in conversion of yajl to
jansson.
This broke qemu mandatory locking detection.
Fixes commit bd1c5c9f4dcf38458099db8a0bf4659a07ef055d.
---
lib/qemu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/qemu.c b/lib/qemu.c
index a50eca988..3e7f15946 100644
--- a/lib/qemu.c
+++ b/lib/qemu.c
@@ -616,7 +616,7 @@ guestfs_int_qemu_mandatory_locking (guestfs_h *g,
members = json_object_get (v, "members");
if (json_is_array (members)) {
json_array_foreach (members, j, m) {
- name = json_object_get (v, "name");
+ name = json_object_get (m, "name");
if (json_is_string (name) &&
STREQ (json_string_value (name), "locking"))
return 1;
--
2.15.1

View File

@ -39,7 +39,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.39.2 Version: 1.39.2
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
# Source and patches. # Source and patches.
@ -49,6 +49,9 @@ Source0: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar
Source1: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar.gz.sig Source1: http://libguestfs.org/download/1.38-stable/%{name}-%{version}.tar.gz.sig
%endif %endif
# Upstream patch fixes qemu mandatory locking detection.
Patch1: 0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch
# Replacement README file for Fedora users. # Replacement README file for Fedora users.
Source4: README-replacement.in Source4: README-replacement.in
@ -1398,6 +1401,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%changelog %changelog
* Thu Mar 29 2018 Richard W.M. Jones <rjones@redhat.com> - 1:1.39.2-2
- Add patch to fix detection of qemu mandatory locking.
* Thu Mar 29 2018 Richard W.M. Jones <rjones@redhat.com> - 1:1.39.2-1 * Thu Mar 29 2018 Richard W.M. Jones <rjones@redhat.com> - 1:1.39.2-1
- New upstream version 1.39.2. - New upstream version 1.39.2.