From f034e58d54666cc0edc7910a160149ce030cfbed Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 29 Mar 2018 20:22:28 +0100
Subject: [PATCH] Add patch to fix detection of qemu mandatory locking.

---
 ...iption-error-in-conversion-of-yajl-t.patch | 29 +++++++++++++++++++
 libguestfs.spec                               |  8 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch

diff --git a/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch b/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch
new file mode 100644
index 0000000..fdc7d26
--- /dev/null
+++ b/0001-qemu-Fix-transcription-error-in-conversion-of-yajl-t.patch
@@ -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
+
diff --git a/libguestfs.spec b/libguestfs.spec
index f833148..75c2439 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -39,7 +39,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.39.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 
 # 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
 %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.
 Source4:       README-replacement.in
 
@@ -1398,6 +1401,9 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
 
 
 %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
 - New upstream version 1.39.2.