diff --git a/0015-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
similarity index 98%
rename from 0015-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
rename to 0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
index 32a89d9..170f396 100644
--- a/0015-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
+++ b/0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
@@ -1,4 +1,4 @@
-From c508b3390245bbecfa8acf785b7d7bfd215859ae Mon Sep 17 00:00:00 2001
+From 61c266ec6c4190f9ad27413cc15461678e5979d6 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Jul 2013 14:47:56 +0100
 Subject: [PATCH] RHEL: Disable unsupported remote drive protocols
@@ -26,7 +26,7 @@ Note 'nbd' is not disabled, and of course 'file' works.
  8 files changed, 8 insertions(+), 336 deletions(-)
 
 diff --git a/docs/guestfs-testing.pod b/docs/guestfs-testing.pod
-index f5c09df6e..ee4b26d6b 100644
+index 45ebe2941..a02f766c9 100644
 --- a/docs/guestfs-testing.pod
 +++ b/docs/guestfs-testing.pod
 @@ -109,26 +109,6 @@ image.  To exit, type C<exit>.
@@ -57,7 +57,7 @@ index f5c09df6e..ee4b26d6b 100644
  
  Run L<virt-alignment-scan(1)> on guests or disk images:
 diff --git a/fish/guestfish.pod b/fish/guestfish.pod
-index da47c86d6..33fc8b2c8 100644
+index ac14ea5a4..8d4d488fc 100644
 --- a/fish/guestfish.pod
 +++ b/fish/guestfish.pod
 @@ -131,9 +131,9 @@ To list what is available do:
@@ -142,7 +142,7 @@ index da47c86d6..33fc8b2c8 100644
  In this case, the password is C<pass@word>.
  
 diff --git a/fish/test-add-uri.sh b/fish/test-add-uri.sh
-index 533a3ce0c..ddabeb639 100755
+index e4e1021db..8419ce78a 100755
 --- a/fish/test-add-uri.sh
 +++ b/fish/test-add-uri.sh
 @@ -40,10 +40,6 @@ function fail ()
@@ -180,7 +180,7 @@ index 533a3ce0c..ddabeb639 100755
  rm test-add-uri.out
  rm test-add-uri.img
 diff --git a/generator/actions_core.ml b/generator/actions_core.ml
-index 20f6e8436..768f58433 100644
+index 5e8de563a..5e347ca85 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
 @@ -350,22 +350,6 @@ F<filename> is interpreted as a local file or device.
@@ -394,7 +394,7 @@ index c068b8ecb..6e4453ce5 100644
      error (g, _("unknown protocol ‘%s’"), protocol);
      drv = NULL; /*FALLTHROUGH*/
 diff --git a/lib/guestfs.pod b/lib/guestfs.pod
-index ecab0e1f3..dff32cc9e 100644
+index d2c90418e..85d765aa8 100644
 --- a/lib/guestfs.pod
 +++ b/lib/guestfs.pod
 @@ -723,51 +723,6 @@ a qcow2 backing file specification, libvirt does not construct an
@@ -479,7 +479,7 @@ index ecab0e1f3..dff32cc9e 100644
  
  Libguestfs has APIs for inspecting an unknown disk image to find out
 diff --git a/tests/disks/test-qemu-drive-libvirt.sh b/tests/disks/test-qemu-drive-libvirt.sh
-index afbeddec6..93df4be0a 100755
+index 485d75718..e917cd1a6 100755
 --- a/tests/disks/test-qemu-drive-libvirt.sh
 +++ b/tests/disks/test-qemu-drive-libvirt.sh
 @@ -65,13 +65,6 @@ check_output
@@ -497,10 +497,10 @@ index afbeddec6..93df4be0a 100755
  
  $guestfish -d nbd run ||:
 diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh
-index 9ee7df389..b3e4f9903 100755
+index d6ce0f07f..153b9c8cc 100755
 --- a/tests/disks/test-qemu-drive.sh
 +++ b/tests/disks/test-qemu-drive.sh
-@@ -62,35 +62,6 @@ check_output
+@@ -63,35 +63,6 @@ check_output
  grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail
  rm "$DEBUG_QEMU_FILE"
  
@@ -536,7 +536,7 @@ index 9ee7df389..b3e4f9903 100755
  # NBD.
  
  guestfish <<EOF ||:
-@@ -108,14 +79,3 @@ EOF
+@@ -109,14 +80,3 @@ EOF
  check_output
  grep -sq -- '-drive file=nbd:unix:/socket,' "$DEBUG_QEMU_FILE" || fail
  rm "$DEBUG_QEMU_FILE"
@@ -552,5 +552,5 @@ index 9ee7df389..b3e4f9903 100755
 -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
 -- 
-2.43.0
+2.47.1
 
diff --git a/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch b/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch
deleted file mode 100644
index 4934e02..0000000
--- a/0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0edaea8f91bf08025651eeff32f53b9335003842 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 8 Oct 2024 14:53:38 +0100
-Subject: [PATCH] website: Add links for 1.54 and 1.55 download locations
-
----
- website/index.html.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/website/index.html.in b/website/index.html.in
-index a61fca924..2a0d32217 100644
---- a/website/index.html.in
-+++ b/website/index.html.in
-@@ -186,9 +186,10 @@ git clone <a href="https://github.com/libguestfs/libguestfs">https://github.com/
- LATEST-URL: http://libguestfs.org/download/1.53-development/libguestfs-@PACKAGE_VERSION@.tar.gz
- LATEST-VERSION: @PACKAGE_VERSION@
-   -->
--  <a href="download/1.53-development/">Latest development version: <strong>@PACKAGE_VERSION@</strong></a> (released <strong>@RELEASE_DATE@</strong>).<br/>
-+  <a href="download/1.55-development/">Latest development version: <strong>@PACKAGE_VERSION@</strong></a> (released <strong>@RELEASE_DATE@</strong>).<br/>
-   Stable branch:
-   <strong>
-+  <a href="download/1.54-stable/">1.54.x</a>,
-   <a href="download/1.52-stable/">1.52.x</a>,
-   <a href="download/1.50-stable/">1.50.x</a>,
-   <a href="download/1.48-stable/">1.48.x</a>
--- 
-2.43.0
-
diff --git a/0016-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
similarity index 94%
rename from 0016-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
rename to 0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
index af931cd..d41bca4 100644
--- a/0016-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+++ b/0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
@@ -1,4 +1,4 @@
-From b8c15791942f56030b49c5e725e61bbba4a990d2 Mon Sep 17 00:00:00 2001
+From fb0b57a61b6a5a2259fb9f7ad2d6271f505acde4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 7 Jul 2015 09:28:03 -0400
 Subject: [PATCH] RHEL: Reject use of libguestfs-winsupport features except for
@@ -13,7 +13,7 @@ edits.
  3 files changed, 19 insertions(+)
 
 diff --git a/generator/c.ml b/generator/c.ml
-index 838e7f426..09181028b 100644
+index a51031eff..90b8ffeb9 100644
 --- a/generator/c.ml
 +++ b/generator/c.ml
 @@ -1836,6 +1836,22 @@ and generate_client_actions actions () =
@@ -40,7 +40,7 @@ index 838e7f426..09181028b 100644
       * as a progress bar hint.
       *)
 diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh
-index 16debd129..1c13ddac3 100755
+index 0ec6b4851..9fa29f98b 100755
 --- a/test-data/phony-guests/make-windows-img.sh
 +++ b/test-data/phony-guests/make-windows-img.sh
 @@ -37,6 +37,7 @@ fi
@@ -65,5 +65,5 @@ index 105291dc3..5ca4f3b6d 100644
      exit (EXIT_FAILURE);
  
 -- 
-2.43.0
+2.47.1
 
diff --git a/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch b/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch
deleted file mode 100644
index 36ef1b0..0000000
--- a/0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c25ff1a8022cf345d3ce29682207ed3732a4244a Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 14 Oct 2024 10:43:08 +0100
-Subject: [PATCH] tests/gdisk/test-expand-gpt.pl: Implement SKIP rule for this
- test
-
-Reported-by: David Runge
-Related: https://github.com/libguestfs/libguestfs/issues/155
----
- tests/gdisk/test-expand-gpt.pl | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/gdisk/test-expand-gpt.pl b/tests/gdisk/test-expand-gpt.pl
-index 23a52b23c..5c77247c0 100755
---- a/tests/gdisk/test-expand-gpt.pl
-+++ b/tests/gdisk/test-expand-gpt.pl
-@@ -20,6 +20,11 @@ use warnings;
- 
- use Sys::Guestfs;
- 
-+if ($ENV{SKIP_TEST_EXPAND_GPT_PL}) {
-+    print "$0: test skipped because SKIP_TEST_EXPAND_GPT_PL is set\n";
-+    exit 77;
-+}
-+
- sub tests {
- 	my $g = Sys::Guestfs->new ();
- 
--- 
-2.43.0
-
diff --git a/0003-lib-Print-kernel-utsname-in-debug-output.patch b/0003-lib-Print-kernel-utsname-in-debug-output.patch
new file mode 100644
index 0000000..df65b00
--- /dev/null
+++ b/0003-lib-Print-kernel-utsname-in-debug-output.patch
@@ -0,0 +1,48 @@
+From a2bd2c18940c8779da87737c9811ca0b63e96dde Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Mon, 10 Mar 2025 18:52:08 +0000
+Subject: [PATCH] lib: Print kernel utsname in debug output
+
+Useful for debugging problems caused by the host kernel.  In
+particular we were looking at a problem with passt creating a user
+namespace but didn't know what exact kernel was being used.
+
+(cherry picked from commit 31fa712aa07190f2c5ed789712b92b4be2d51488)
+---
+ lib/launch.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/lib/launch.c b/lib/launch.c
+index ddf303a66..495b0c65d 100644
+--- a/lib/launch.c
++++ b/lib/launch.c
+@@ -36,6 +36,7 @@
+ #include <signal.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/utsname.h>
+ #include <sys/wait.h>
+ #include <errno.h>
+ #include <assert.h>
+@@ -93,6 +94,7 @@ guestfs_impl_launch (guestfs_h *g)
+     struct backend *b;
+     CLEANUP_FREE char *backend = guestfs_get_backend (g);
+     int mask;
++    struct utsname utsname;
+ 
+     debug (g, "launch: program=%s", g->program);
+     if (STRNEQ (g->identifier, ""))
+@@ -109,6 +111,10 @@ guestfs_impl_launch (guestfs_h *g)
+     if (mask >= 0)
+       debug (g, "launch: umask=0%03o", (unsigned) mask);
+     debug (g, "launch: euid=%ju", (uintmax_t) geteuid ());
++    if (uname (&utsname) == 0)
++      debug (g, "launch: host: %s %s %s %s %s",
++             utsname.sysname, utsname.nodename, utsname.release,
++             utsname.version, utsname.machine);
+   }
+ 
+   /* Launch the appliance. */
+-- 
+2.47.1
+
diff --git a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch b/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch
deleted file mode 100644
index 2c6d26a..0000000
--- a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0f489f8eec0c02e9ed1d606a2032edccf81ef025 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 17 Oct 2024 08:59:49 +0100
-Subject: [PATCH] lib/inspect-osinfo.c: Add Windows Server 2025 osinfo
-
-The guest was found to have these inspection fields:
-
-    type: windows
-    distro: windows
-    product_name: Windows Server 2025 Standard
-    product_variant: Server
-    version: 10.0
-    arch: x86_64
-    hostname: WIN-84V4KKQ30SM
-    build ID: 26080
-    windows_systemroot: /Windows
-    windows_software_hive: /Windows/System32/config/SOFTWARE
-    windows_system_hive: /Windows/System32/config/SYSTEM
-    windows_current_control_set: ControlSet001
-
-Reported-by: Ming Xie
-Fixes: https://issues.redhat.com/browse/RHEL-62935
----
- lib/inspect-osinfo.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/inspect-osinfo.c b/lib/inspect-osinfo.c
-index c77344f63..f792d771a 100644
---- a/lib/inspect-osinfo.c
-+++ b/lib/inspect-osinfo.c
-@@ -142,7 +142,9 @@ guestfs_impl_inspect_get_osinfo (guestfs_h *g, const char *root)
-       switch (minor) {
-       case 0:
-         if (strstr (product_variant, "Server")) {
--          if (strstr (product_name, "2022"))
-+          if (strstr (product_name, "2025"))
-+            return safe_strdup (g, "win2k25");
-+          else if (strstr (product_name, "2022"))
-             return safe_strdup (g, "win2k22");
-           else if (strstr (product_name, "2019"))
-             return safe_strdup (g, "win2k19");
--- 
-2.43.0
-
diff --git a/0004-build-Assume-__attribute__-cleanup-always-works.patch b/0004-build-Assume-__attribute__-cleanup-always-works.patch
deleted file mode 100644
index a6551ad..0000000
--- a/0004-build-Assume-__attribute__-cleanup-always-works.patch
+++ /dev/null
@@ -1,412 +0,0 @@
-From e37768d8892d6f467c7834f8b142b89f8f0af7dc Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 18 Oct 2024 21:52:21 +0100
-Subject: [PATCH] build: Assume __attribute__((cleanup)) always works
-
-All recent compilers support this (except MS compilers which we don't
-care about).  Assume it is supported.  We test it in ./configure and
-hard fail if it doesn't work.
-
-We still define HAVE_ATTRIBUTE_CLEANUP but you can now assume it is
-always defined and don't have to check it.
----
- common                 |  2 +-
- daemon/daemon.h        |  9 ---------
- daemon/sh.c            |  5 -----
- daemon/yara.c          |  8 --------
- generator/c.ml         | 10 ----------
- generator/daemon.ml    | 15 ---------------
- lib/guestfs-internal.h |  8 --------
- lib/info.c             |  5 -----
- lib/launch-libvirt.c   |  5 -----
- lib/qemu.c             |  5 -----
- m4/guestfs-c.m4        |  7 ++-----
- 11 files changed, 3 insertions(+), 76 deletions(-)
-
-Submodule common b6e703dcc..01c532260:
-diff --git a/common/structs/structs-cleanups.h b/common/structs/structs-cleanups.h
-index b43dbd7..c6e7fd1 100644
---- a/common/structs/structs-cleanups.h
-+++ b/common/structs/structs-cleanups.h
-@@ -28,7 +28,6 @@
- #ifndef GUESTFS_STRUCTS_CLEANUPS_H_
- #define GUESTFS_STRUCTS_CLEANUPS_H_
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_FREE_INT_BOOL \
-   __attribute__((cleanup(guestfs_int_cleanup_free_int_bool)))
- #define CLEANUP_FREE_INT_BOOL_LIST \
-@@ -137,62 +136,6 @@
-   __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection)))
- #define CLEANUP_FREE_YARA_DETECTION_LIST \
-   __attribute__((cleanup(guestfs_int_cleanup_free_yara_detection_list)))
--#else /* !HAVE_ATTRIBUTE_CLEANUP */
--#define CLEANUP_FREE_INT_BOOL
--#define CLEANUP_FREE_INT_BOOL_LIST
--#define CLEANUP_FREE_LVM_PV
--#define CLEANUP_FREE_LVM_PV_LIST
--#define CLEANUP_FREE_LVM_VG
--#define CLEANUP_FREE_LVM_VG_LIST
--#define CLEANUP_FREE_LVM_LV
--#define CLEANUP_FREE_LVM_LV_LIST
--#define CLEANUP_FREE_STAT
--#define CLEANUP_FREE_STAT_LIST
--#define CLEANUP_FREE_STATNS
--#define CLEANUP_FREE_STATNS_LIST
--#define CLEANUP_FREE_STATVFS
--#define CLEANUP_FREE_STATVFS_LIST
--#define CLEANUP_FREE_DIRENT
--#define CLEANUP_FREE_DIRENT_LIST
--#define CLEANUP_FREE_VERSION
--#define CLEANUP_FREE_VERSION_LIST
--#define CLEANUP_FREE_XATTR
--#define CLEANUP_FREE_XATTR_LIST
--#define CLEANUP_FREE_INOTIFY_EVENT
--#define CLEANUP_FREE_INOTIFY_EVENT_LIST
--#define CLEANUP_FREE_PARTITION
--#define CLEANUP_FREE_PARTITION_LIST
--#define CLEANUP_FREE_APPLICATION
--#define CLEANUP_FREE_APPLICATION_LIST
--#define CLEANUP_FREE_APPLICATION2
--#define CLEANUP_FREE_APPLICATION2_LIST
--#define CLEANUP_FREE_ISOINFO
--#define CLEANUP_FREE_ISOINFO_LIST
--#define CLEANUP_FREE_MDSTAT
--#define CLEANUP_FREE_MDSTAT_LIST
--#define CLEANUP_FREE_BTRFSSUBVOLUME
--#define CLEANUP_FREE_BTRFSSUBVOLUME_LIST
--#define CLEANUP_FREE_BTRFSQGROUP
--#define CLEANUP_FREE_BTRFSQGROUP_LIST
--#define CLEANUP_FREE_BTRFSBALANCE
--#define CLEANUP_FREE_BTRFSBALANCE_LIST
--#define CLEANUP_FREE_BTRFSSCRUB
--#define CLEANUP_FREE_BTRFSSCRUB_LIST
--#define CLEANUP_FREE_XFSINFO
--#define CLEANUP_FREE_XFSINFO_LIST
--#define CLEANUP_FREE_UTSNAME
--#define CLEANUP_FREE_UTSNAME_LIST
--#define CLEANUP_FREE_HIVEX_NODE
--#define CLEANUP_FREE_HIVEX_NODE_LIST
--#define CLEANUP_FREE_HIVEX_VALUE
--#define CLEANUP_FREE_HIVEX_VALUE_LIST
--#define CLEANUP_FREE_INTERNAL_MOUNTABLE
--#define CLEANUP_FREE_INTERNAL_MOUNTABLE_LIST
--#define CLEANUP_FREE_TSK_DIRENT
--#define CLEANUP_FREE_TSK_DIRENT_LIST
--#define CLEANUP_FREE_YARA_DETECTION
--#define CLEANUP_FREE_YARA_DETECTION_LIST
--#endif /* !HAVE_ATTRIBUTE_CLEANUP */
- 
- /* These functions are used internally by the CLEANUP_* macros.
-  * Don't call them directly.
-diff --git a/common/utils/cleanups.h b/common/utils/cleanups.h
-index 932114f..be52d07 100644
---- a/common/utils/cleanups.h
-+++ b/common/utils/cleanups.h
-@@ -19,7 +19,6 @@
- #ifndef GUESTFS_CLEANUPS_H_
- #define GUESTFS_CLEANUPS_H_
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_FREE                                    \
-   __attribute__((cleanup(guestfs_int_cleanup_free)))
- #define CLEANUP_HASH_FREE                                       \
-@@ -50,23 +49,6 @@
-   __attribute__((cleanup(guestfs_int_cleanup_xmlXPathFreeObject)))
- #define CLEANUP_PCRE2_MATCH_DATA_FREE                                   \
-   __attribute__((cleanup(guestfs_int_cleanup_pcre2_match_data_free)))
--#else
--#define CLEANUP_FREE
--#define CLEANUP_HASH_FREE
--#define CLEANUP_UNLINK_FREE
--#define CLEANUP_CLOSE
--#define CLEANUP_FCLOSE
--#define CLEANUP_PCLOSE
--#define CLEANUP_FREE_STRING_LIST
--#define CLEANUP_XMLFREE
--#define CLEANUP_XMLBUFFERFREE
--#define CLEANUP_XMLFREEDOC
--#define CLEANUP_XMLFREEURI
--#define CLEANUP_XMLFREETEXTWRITER
--#define CLEANUP_XMLXPATHFREECONTEXT
--#define CLEANUP_XMLXPATHFREEOBJECT
--#define CLEANUP_PCRE2_MATCH_DATA_FREE
--#endif
- 
- /* These functions are used internally by the CLEANUP_* macros.
-  * Don't call them directly.
-diff --git a/daemon/daemon.h b/daemon/daemon.h
-index e050588ca..5fc53245c 100644
---- a/daemon/daemon.h
-+++ b/daemon/daemon.h
-@@ -93,11 +93,7 @@ extern char *read_whole_file (const char *filename, size_t *size_r);
- extern char *mountable_to_string (const mountable_t *mountable);
- extern void cleanup_free_mountable (mountable_t *mountable);
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_FREE_MOUNTABLE __attribute__((cleanup(cleanup_free_mountable)))
--#else
--#define CLEANUP_FREE_MOUNTABLE
--#endif
- 
- /* cleanups.c */
- /* These functions are used internally by the CLEANUP_* macros.
-@@ -106,13 +102,8 @@ extern void cleanup_free_mountable (mountable_t *mountable);
- extern void cleanup_aug_close (void *ptr);
- extern void cleanup_free_stringsbuf (void *ptr);
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_AUG_CLOSE __attribute__((cleanup(cleanup_aug_close)))
- #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(cleanup_free_stringsbuf)))
--#else
--#define CLEANUP_AUG_CLOSE
--#define CLEANUP_FREE_STRINGSBUF
--#endif
- 
- /* mount.c */
- extern int is_root_mounted (void);
-diff --git a/daemon/sh.c b/daemon/sh.c
-index 92ce08be0..21d4deeab 100644
---- a/daemon/sh.c
-+++ b/daemon/sh.c
-@@ -32,13 +32,8 @@
- 
- #include "ignore-value.h"
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_BIND_STATE __attribute__((cleanup(free_bind_state)))
- #define CLEANUP_RESOLVER_STATE __attribute__((cleanup(free_resolver_state)))
--#else
--#define CLEANUP_BIND_STATE
--#define CLEANUP_RESOLVER_STATE
--#endif
- 
- struct bind_state {
-   bool mounted;
-diff --git a/daemon/yara.c b/daemon/yara.c
-index 21137b733..9350dd27b 100644
---- a/daemon/yara.c
-+++ b/daemon/yara.c
-@@ -39,12 +39,8 @@
- 
- #include <yara.h>
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_DESTROY_YARA_COMPILER                           \
-   __attribute__((cleanup(cleanup_destroy_yara_compiler)))
--#else
--#define CLEANUP_DESTROY_YARA_COMPILER
--#endif
- 
- struct write_callback_data {
-   int fd;
-@@ -208,10 +204,6 @@ compile_rules_file (const char *rules_path)
-   }
- 
-  err:
--#ifndef HAVE_ATTRIBUTE_CLEANUP
--  yr_compiler_destroy (compiler);
--#endif
--
-   return ret;
- }
- 
-diff --git a/generator/c.ml b/generator/c.ml
-index 447059b8a..838e7f426 100644
---- a/generator/c.ml
-+++ b/generator/c.ml
-@@ -817,7 +817,6 @@ and generate_client_structs_cleanups_h () =
- #ifndef GUESTFS_STRUCTS_CLEANUPS_H_
- #define GUESTFS_STRUCTS_CLEANUPS_H_
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- ";
- 
-   List.iter (
-@@ -828,16 +827,7 @@ and generate_client_structs_cleanups_h () =
-       pr "  __attribute__((cleanup(guestfs_int_cleanup_free_%s_list)))\n" name
-   ) structs;
- 
--  pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n";
--
--  List.iter (
--    fun { s_name = name } ->
--      pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name);
--      pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name)
--  ) structs;
--
-   pr "\
--#endif /* !HAVE_ATTRIBUTE_CLEANUP */
- 
- /* These functions are used internally by the CLEANUP_* macros.
-  * Don't call them directly.
-diff --git a/generator/daemon.ml b/generator/daemon.ml
-index 78a2412d2..9ab9e12df 100644
---- a/generator/daemon.ml
-+++ b/generator/daemon.ml
-@@ -127,8 +127,6 @@ let generate_daemon_stubs actions () =
-                     args_passed_to_daemon in
- 
-       if args_passed_to_daemon <> [] then (
--        pr "#ifdef HAVE_ATTRIBUTE_CLEANUP\n";
--        pr "\n";
-         pr "#define CLEANUP_XDR_FREE_%s_ARGS \\\n" uc_name;
-         pr "    __attribute__((cleanup(cleanup_xdr_free_%s_args)))\n" name;
-         pr "\n";
-@@ -140,9 +138,6 @@ let generate_daemon_stubs actions () =
-            name;
-         pr "}\n";
-         pr "\n";
--        pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n";
--        pr "#define CLEANUP_XDR_FREE_%s_ARGS\n" uc_name;
--        pr "#endif /* !HAVE_ATTRIBUTE_CLEANUP */\n";
-         pr "\n"
-       );
- 
-@@ -1315,7 +1310,6 @@ let generate_daemon_structs_cleanups_h () =
- #ifndef GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_
- #define GUESTFS_DAEMON_STRUCTS_CLEANUPS_H_
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- ";
- 
-   List.iter (
-@@ -1326,16 +1320,7 @@ let generate_daemon_structs_cleanups_h () =
-       pr "  __attribute__((cleanup(cleanup_free_int_%s_list)))\n" name
-   ) structs;
- 
--  pr "#else /* !HAVE_ATTRIBUTE_CLEANUP */\n";
--
--  List.iter (
--    fun { s_name = name } ->
--      pr "#define CLEANUP_FREE_%s\n" (String.uppercase_ascii name);
--      pr "#define CLEANUP_FREE_%s_LIST\n" (String.uppercase_ascii name)
--  ) structs;
--
-   pr "\
--#endif /* !HAVE_ATTRIBUTE_CLEANUP */
- 
- /* These functions are used internally by the CLEANUP_* macros.
-  * Don't call them directly.
-diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
-index 174ca135f..f9f4628aa 100644
---- a/lib/guestfs-internal.h
-+++ b/lib/guestfs-internal.h
-@@ -661,11 +661,7 @@ extern void guestfs_int_end_stringsbuf (guestfs_h *g, struct stringsbuf *sb);
- 
- extern void guestfs_int_free_stringsbuf (struct stringsbuf *sb);
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_FREE_STRINGSBUF __attribute__((cleanup(guestfs_int_cleanup_free_stringsbuf)))
--#else
--#define CLEANUP_FREE_STRINGSBUF
--#endif
- extern void guestfs_int_cleanup_free_stringsbuf (struct stringsbuf *sb);
- 
- /* proto.c */
-@@ -785,11 +781,7 @@ extern int guestfs_int_cmd_pipe_run (struct command *cmd, const char *mode);
- extern int guestfs_int_cmd_pipe_wait (struct command *cmd);
- extern char *guestfs_int_cmd_get_pipe_errors (struct command *cmd);
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_CMD_CLOSE __attribute__((cleanup(guestfs_int_cleanup_cmd_close)))
--#else
--#define CLEANUP_CMD_CLOSE
--#endif
- extern void guestfs_int_cleanup_cmd_close (struct command **);
- 
- /* launch-*.c constructors */
-diff --git a/lib/info.c b/lib/info.c
-index 4dee7a26a..b60fc8b39 100644
---- a/lib/info.c
-+++ b/lib/info.c
-@@ -43,7 +43,6 @@
- #include "guestfs-internal.h"
- #include "guestfs-internal-actions.h"
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref)))
- 
- static void
-@@ -52,10 +51,6 @@ cleanup_json_t_decref (void *ptr)
-   json_decref (* (json_t **) ptr);
- }
- 
--#else
--#define CLEANUP_JSON_T_DECREF
--#endif
--
- static json_t *get_json_output (guestfs_h *g, const char *filename);
- static int qemu_img_supports_U_option (guestfs_h *g);
- static void set_child_rlimits (struct command *);
-diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
-index fed6dcc86..d01f65780 100644
---- a/lib/launch-libvirt.c
-+++ b/lib/launch-libvirt.c
-@@ -97,7 +97,6 @@ xmlBufferDetach (xmlBufferPtr buf)
- }
- #endif
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_VIRSECRETFREE __attribute__((cleanup(cleanup_virSecretFree)))
- 
- static void
-@@ -108,10 +107,6 @@ cleanup_virSecretFree (void *ptr)
-     virSecretFree (secret_obj);
- }
- 
--#else /* !HAVE_ATTRIBUTE_CLEANUP */
--#define CLEANUP_VIRSECRETFREE
--#endif
--
- /* List used to store a mapping of secret to libvirt secret UUID. */
- struct secret {
-   char *secret;
-diff --git a/lib/qemu.c b/lib/qemu.c
-index 027790e4e..886c92e5d 100644
---- a/lib/qemu.c
-+++ b/lib/qemu.c
-@@ -46,7 +46,6 @@
- #include "guestfs-internal.h"
- #include "guestfs_protocol.h"
- 
--#ifdef HAVE_ATTRIBUTE_CLEANUP
- #define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref)))
- 
- static void
-@@ -55,10 +54,6 @@ cleanup_json_t_decref (void *ptr)
-   json_decref (* (json_t **) ptr);
- }
- 
--#else
--#define CLEANUP_JSON_T_DECREF
--#endif
--
- struct qemu_data {
-   int generation;               /* MEMO_GENERATION read from qemu.stat */
-   uint64_t prev_size;           /* Size of qemu binary when cached. */
-diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
-index 44c64b6d6..49109cc8f 100644
---- a/m4/guestfs-c.m4
-+++ b/m4/guestfs-c.m4
-@@ -109,15 +109,12 @@ main (int argc, char *argv[])
-     AC_MSG_RESULT([yes])
-     AC_DEFINE([HAVE_ATTRIBUTE_CLEANUP],[1],[Define to 1 if '__attribute__((cleanup(...)))' works with this compiler.])
-     ],[
--    AC_MSG_WARN(
-+    AC_MSG_ERROR(
- ['__attribute__((cleanup(...)))' does not work.
- 
- You may not be using a sufficiently recent version of GCC or CLANG, or
- you may be using a C compiler which does not support this attribute,
--or the configure test may be wrong.
--
--The code will still compile, but is likely to leak memory and other
--resources when it runs.])])
-+or the configure test may be wrong.])])
- dnl restore CFLAGS
- CFLAGS="${acx_nbdkit_save_CFLAGS}"
- 
--- 
-2.43.0
-
diff --git a/0004-daemon-Fix-loongarch64-detection-on-RHEL-9.patch b/0004-daemon-Fix-loongarch64-detection-on-RHEL-9.patch
new file mode 100644
index 0000000..158c81c
--- /dev/null
+++ b/0004-daemon-Fix-loongarch64-detection-on-RHEL-9.patch
@@ -0,0 +1,32 @@
+From 02a4073c0a416d5a6c1592b4f3647750869acc28 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Tue, 11 Mar 2025 13:36:12 +0000
+Subject: [PATCH] daemon: Fix loongarch64 detection on RHEL 9
+
+$ rpm -q file
+file-5.39-16.el9.x86_64
+$ file ./test-data/binaries/bin-loongarch64-dynamic
+./test-data/binaries/bin-loongarch64-dynamic: ELF 64-bit LSB pie executable, *unknown arch 0x102* version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-loongarch-lp64d.so.1, BuildID[sha1]=7622a1a70bf6e697851ac3790557e1ca686459b5, for GNU/Linux 5.19.0, stripped
+
+Updates: commit 729d6d55ea84494f0398d02450bd29c39c55f0bd
+(cherry picked from commit 4176b2043f6cf65f8f5f4f7d6fa39beb9c0a22c6)
+---
+ daemon/filearch.ml | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/daemon/filearch.ml b/daemon/filearch.ml
+index 471b3bf5e..6eed7d396 100644
+--- a/daemon/filearch.ml
++++ b/daemon/filearch.ml
+@@ -100,6 +100,8 @@ and canonical_elf_arch bits endianness elf_arch =
+   )
+   else if substr "LoongArch" then
+     sprintf "loongarch%s" bits
++  else if substr "*unknown arch 0x102*" then (* file command on RHEL 9 *)
++    sprintf "loongarch%s" bits
+   else
+     elf_arch
+ 
+-- 
+2.47.1
+
diff --git a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch b/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch
deleted file mode 100644
index 07e10a6..0000000
--- a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 53632b4b8245a6dd67c95015d52d1f4c562b14ed Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 21 Oct 2024 11:50:05 +0100
-Subject: [PATCH] appliance: Use stable owner, group and mtime in appliance
- tarballs
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025
-Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
----
- appliance/Makefile.am | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 8cb9bd1ff..7edc90e61 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -113,12 +113,17 @@ packagelist: packagelist.in Makefile guestfsd.deps
- 	cmp -s $@ $@-t || mv $@-t $@
- 	rm -f $@-t
- 
-+# Use stable times and owner/group (RHBZ#2320025).
-+TAR_COMMAND := tar -z \
-+	--owner=0 --group=0 \
-+	$${SOURCE_DATE_EPOCH:+--mtime=@"$$SOURCE_DATE_EPOCH"}
-+
- supermin.d/daemon.tar.gz: ../daemon/guestfsd
- 	rm -f $@ $@-t
- 	rm -rf tmp-d
- 	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc
- 	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
--	( cd tmp-d && tar zcf - * ) > $@-t
-+	( cd tmp-d && $(TAR_COMMAND) -cf - * ) > $@-t
- 	rm -r tmp-d
- 	mv $@-t $@
- 
-@@ -139,7 +144,7 @@ supermin.d/hostfiles: hostfiles.in Makefile
- 
- supermin.d/init.tar.gz: init
- 	rm -f $@ $@-t
--	( cd $(srcdir) && tar zcf - init ) > $@-t
-+	( cd $(srcdir) && $(TAR_COMMAND) -cf - init ) > $@-t
- 	mv $@-t $@
- 
- # We should put this file in /lib/udev/rules.d, but put it in /etc so
-@@ -149,7 +154,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs-serial.rules
- 	rm -rf tmp-u
- 	mkdir -p tmp-u/etc/udev/rules.d
- 	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
--	( cd tmp-u && tar zcf - etc ) > $@-t
-+	( cd tmp-u && $(TAR_COMMAND) -cf - etc ) > $@-t
- 	rm -r tmp-u
- 	mv $@-t $@
- 
--- 
-2.43.0
-
diff --git a/0006-appliance-Refactor-the-TAR_COMMAND-macro.patch b/0006-appliance-Refactor-the-TAR_COMMAND-macro.patch
deleted file mode 100644
index 5333947..0000000
--- a/0006-appliance-Refactor-the-TAR_COMMAND-macro.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 798e3e59b2af5057521c170268c03ab88aaf1307 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 09:14:15 +0100
-Subject: [PATCH] appliance: Refactor the TAR_COMMAND macro
-
-No change, just make it easier to understand.
-
-Updates: commit 53632b4b8245a6dd67c95015d52d1f4c562b14ed
----
- appliance/Makefile.am | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 7edc90e61..ce9940358 100644
---- a/appliance/Makefile.am
-+++ b/appliance/Makefile.am
-@@ -113,8 +113,9 @@ packagelist: packagelist.in Makefile guestfsd.deps
- 	cmp -s $@ $@-t || mv $@-t $@
- 	rm -f $@-t
- 
--# Use stable times and owner/group (RHBZ#2320025).
--TAR_COMMAND := tar -z \
-+# Use stable owner/group and mtimes (RHBZ#2320025).
-+TAR_OPTIONS := \
-+	-z \
- 	--owner=0 --group=0 \
- 	$${SOURCE_DATE_EPOCH:+--mtime=@"$$SOURCE_DATE_EPOCH"}
- 
-@@ -123,7 +124,7 @@ supermin.d/daemon.tar.gz: ../daemon/guestfsd
- 	rm -rf tmp-d
- 	mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc
- 	ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd
--	( cd tmp-d && $(TAR_COMMAND) -cf - * ) > $@-t
-+	( cd tmp-d && tar $(TAR_OPTIONS) -cf - * ) > $@-t
- 	rm -r tmp-d
- 	mv $@-t $@
- 
-@@ -144,7 +145,7 @@ supermin.d/hostfiles: hostfiles.in Makefile
- 
- supermin.d/init.tar.gz: init
- 	rm -f $@ $@-t
--	( cd $(srcdir) && $(TAR_COMMAND) -cf - init ) > $@-t
-+	( cd $(srcdir) && tar $(TAR_OPTIONS) -cf - init ) > $@-t
- 	mv $@-t $@
- 
- # We should put this file in /lib/udev/rules.d, but put it in /etc so
-@@ -154,7 +155,7 @@ supermin.d/udev-rules.tar.gz: 99-guestfs-serial.rules
- 	rm -rf tmp-u
- 	mkdir -p tmp-u/etc/udev/rules.d
- 	for f in $^; do ln $$f tmp-u/etc/udev/rules.d/$$(basename $$f); done
--	( cd tmp-u && $(TAR_COMMAND) -cf - etc ) > $@-t
-+	( cd tmp-u && tar $(TAR_OPTIONS) -cf - etc ) > $@-t
- 	rm -r tmp-u
- 	mv $@-t $@
- 
--- 
-2.43.0
-
diff --git a/0007-build-Add-new-dependency-on-json-c.patch b/0007-build-Add-new-dependency-on-json-c.patch
deleted file mode 100644
index 3ba62a3..0000000
--- a/0007-build-Add-new-dependency-on-json-c.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 53872a0a1a267040677572c30b68bd1e8b62ebe3 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 11:01:25 +0100
-Subject: [PATCH] build: Add new dependency on json-c
-
-This will eventually replace Jansson for all JSON parsing.  However
-this commit simply introduces the new dependency in the configure
-script and documents it.
-
-I chose json-c 0.14 as the baseline since that is the version in RHEL 9.
-Probably earlier versions would work.
----
- docs/guestfs-building.pod | 4 ++++
- m4/guestfs-libraries.m4   | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
-index 2c0845212..de175aaff 100644
---- a/docs/guestfs-building.pod
-+++ b/docs/guestfs-building.pod
-@@ -189,6 +189,10 @@ I<Required>.
- 
- I<Required>.
- 
-+=item json-c E<ge> 0.14
-+
-+I<Required>.
-+
- =item po4a
- 
- I<Required> if compiling from git.
-diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
-index 18c4cd307..ee406d273 100644
---- a/m4/guestfs-libraries.m4
-+++ b/m4/guestfs-libraries.m4
-@@ -304,6 +304,9 @@ LIBS="$old_LIBS"
- dnl Check for Jansson JSON library (required).
- PKG_CHECK_MODULES([JANSSON], [jansson >= 2.7])
- 
-+dnl Check for JSON-C library (required).
-+PKG_CHECK_MODULES([JSON_C], [json-c >= 0.14])
-+
- dnl Check for C++ (optional, we just use this to test the header works).
- AC_PROG_CXX
- 
--- 
-2.43.0
-
diff --git a/0008-daemon-ldm.c-Replace-jansson-with-json-c.patch b/0008-daemon-ldm.c-Replace-jansson-with-json-c.patch
deleted file mode 100644
index a774a2e..0000000
--- a/0008-daemon-ldm.c-Replace-jansson-with-json-c.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-From 5ea1e899e00f49ed27f25697e632d864760faf96 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Fri, 18 Oct 2024 21:44:13 +0100
-Subject: [PATCH] daemon/ldm.c: Replace jansson with json-c
-
----
- daemon/Makefile.am |  4 +--
- daemon/ldm.c       | 89 +++++++++++++++++++++++++---------------------
- 2 files changed, 51 insertions(+), 42 deletions(-)
-
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index bc74b6ef7..bb72c0244 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -225,7 +225,7 @@ guestfsd_LDADD = \
- 	camldaemon.o \
- 	$(ACL_LIBS) \
- 	$(CAP_LIBS) \
--	$(JANSSON_LIBS) \
-+	$(JSON_C_LIBS) \
- 	$(SELINUX_LIBS) \
- 	$(AUGEAS_LIBS) \
- 	$(HIVEX_LIBS) \
-@@ -264,7 +264,7 @@ guestfsd_CFLAGS = \
- 	$(AUGEAS_CFLAGS) \
- 	$(HIVEX_CFLAGS) \
- 	$(SD_JOURNAL_CFLAGS) \
--	$(JANSSON_CFLAGS) \
-+	$(JSON_C_CFLAGS) \
- 	$(PCRE2_CFLAGS) \
- 	$(LIBRPM_CFLAGS)
- 
-diff --git a/daemon/ldm.c b/daemon/ldm.c
-index be4fb9701..1488b9259 100644
---- a/daemon/ldm.c
-+++ b/daemon/ldm.c
-@@ -25,7 +25,7 @@
- #include <sys/stat.h>
- #include <string.h>
- 
--#include <jansson.h>
-+#include <json.h>
- 
- #include "daemon.h"
- #include "actions.h"
-@@ -65,44 +65,54 @@ do_ldmtool_remove_all (void)
-   return 0;
- }
- 
--static json_t *
--parse_json (const char *json, const char *func)
-+static json_object *
-+parse_json (const char *json, const char *caller)
- {
--  json_t *tree;
--  json_error_t err;
-+  json_object *tree = NULL;
-+  json_tokener *tok = NULL;
-+  enum json_tokener_error err;
- 
-   if (verbose)
--    fprintf (stderr, "%s: parsing json: %s\n", func, json);
-+    fprintf (stderr, "%s: parsing json: %s\n", caller, json);
- 
--  tree = json_loads (json, 0, &err);
--  if (tree == NULL) {
--    reply_with_error ("parse error: %s",
--                      strlen (err.text) ? err.text : "unknown error");
-+  tok = json_tokener_new ();
-+  json_tokener_set_flags (tok,
-+                          JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8);
-+  tree = json_tokener_parse_ex (tok, json, strlen (json));
-+  err = json_tokener_get_error (tok);
-+  if (err != json_tokener_success) {
-+    reply_with_error ("%s: parse error: %s",
-+                      caller, json_tokener_error_desc (err));
-+    json_tokener_free (tok);
-     return NULL;
-   }
- 
--  /* Caller should free this by doing 'json_decref (tree);'. */
-+  json_tokener_free (tok);
-+
-+  /* Caller should free this by doing json_object_put (tree). */
-   return tree;
- }
- 
- #define TYPE_ERROR ((char **) -1)
- 
- static char **
--json_value_to_string_list (json_t *node)
-+json_value_to_string_list (json_object *node)
- {
-   CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (strs);
--  json_t *n;
-+  json_object *n;
-   size_t i;
- 
--  if (!json_is_array (node))
-+  if (json_object_get_type (node) != json_type_array)
-     return TYPE_ERROR;
- 
--  json_array_foreach (node, i, n) {
--    if (!json_is_string (n))
-+  for (i = 0; i < json_object_array_length (node); ++i) {
-+    n = json_object_array_get_idx (node, i); /* Doesn't incr the refcount. */
-+    if (json_object_get_type (n) != json_type_string)
-       return TYPE_ERROR;
--    if (add_string (&strs, json_string_value (n)) == -1)
-+    if (add_string (&strs, json_object_get_string (n)) == -1)
-       return NULL;
-   }
-+
-   if (end_stringsbuf (&strs) == -1)
-     return NULL;
- 
-@@ -111,17 +121,17 @@ json_value_to_string_list (json_t *node)
- 
- static char **
- parse_json_get_string_list (const char *json,
--                            const char *func, const char *cmd)
-+                            const char *caller, const char *cmd)
- {
-   char **ret;
--  json_t *tree = NULL;
-+  json_object *tree = NULL;
- 
--  tree = parse_json (json, func);
-+  tree = parse_json (json, caller);
-   if (tree == NULL)
-     return NULL;
- 
-   ret = json_value_to_string_list (tree);
--  json_decref (tree);
-+  json_object_put (tree);
-   if (ret == TYPE_ERROR) {
-     reply_with_error ("output of '%s' was not a JSON array of strings", cmd);
-     return NULL;
-@@ -133,74 +143,73 @@ parse_json_get_string_list (const char *json,
- 
- static char *
- parse_json_get_object_string (const char *json, const char *key, int flags,
--                              const char *func, const char *cmd)
-+                              const char *caller, const char *cmd)
- {
-   const char *str;
-   char *ret;
--  json_t *tree = NULL, *node;
-+  json_object *tree = NULL, *node;
- 
--  tree = parse_json (json, func);
-+  tree = parse_json (json, caller);
-   if (tree == NULL)
-     return NULL;
- 
--  if (!json_is_object (tree))
-+  if (json_object_get_type (tree) != json_type_object)
-     goto bad_type;
- 
--  node = json_object_get (tree, key);
-+  node = json_object_object_get (tree, key);
-   if (node == NULL)
-     goto bad_type;
- 
--  if ((flags & GET_STRING_NULL_TO_EMPTY) && json_is_null (node))
-+  if ((flags & GET_STRING_NULL_TO_EMPTY) &&
-+      json_object_get_type (node) == json_type_null)
-     ret = strdup ("");
-   else {
--    str = json_string_value (node);
--    if (str == NULL)
--      goto bad_type;
--    ret = strndup (str, json_string_length (node));
-+    str = json_object_get_string (node);
-+    ret = strndup (str, strlen (str));
-   }
-   if (ret == NULL)
-     reply_with_perror ("strdup");
- 
--  json_decref (tree);
-+  json_object_put (tree);
- 
-   return ret;
- 
-  bad_type:
-   reply_with_error ("output of '%s' was not a JSON object "
-                     "containing a key '%s' of type string", cmd, key);
--  json_decref (tree);
-+  json_object_put (tree);
-   return NULL;
- }
- 
- static char **
- parse_json_get_object_string_list (const char *json, const char *key,
--                                   const char *func, const char *cmd)
-+                                   const char *caller, const char *cmd)
- {
-   char **ret;
--  json_t *tree, *node;
-+  json_object *tree, *node;
- 
--  tree = parse_json (json, func);
-+  tree = parse_json (json, caller);
-   if (tree == NULL)
-     return NULL;
- 
--  if (!json_is_object (tree))
-+  if (json_object_get_type (tree) != json_type_object)
-     goto bad_type;
- 
--  node = json_object_get (tree, key);
-+  node = json_object_object_get (tree, key);
-   if (node == NULL)
-     goto bad_type;
- 
-   ret = json_value_to_string_list (node);
-   if (ret == TYPE_ERROR)
-     goto bad_type;
--  json_decref (tree);
-+  json_object_put (tree);
-   return ret;
- 
-  bad_type:
-   reply_with_error ("output of '%s' was not a JSON object "
-                     "containing a key '%s' of type array of strings",
-                     cmd, key);
--  json_decref (tree);
-+  json_object_put (tree);
-   return NULL;
- }
- 
--- 
-2.43.0
-
diff --git a/0010-lib-info.c-Replace-jansson-with-json-c.patch b/0010-lib-info.c-Replace-jansson-with-json-c.patch
deleted file mode 100644
index 53fc2c3..0000000
--- a/0010-lib-info.c-Replace-jansson-with-json-c.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-From 13e3222f3463578ab18ee8efc8502c6dfd9f51a4 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 15:55:00 +0100
-Subject: [PATCH] lib/info.c: Replace jansson with json-c
-
----
- lib/Makefile.am |  4 ++-
- lib/info.c      | 85 +++++++++++++++++++++++++------------------------
- 2 files changed, 47 insertions(+), 42 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 0ed1576f8..60567b04b 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -138,7 +138,8 @@ libguestfs_la_CFLAGS = \
- 	$(PCRE2_CFLAGS) \
- 	$(LIBVIRT_CFLAGS) \
- 	$(LIBXML2_CFLAGS) \
--	$(JANSSON_CFLAGS)
-+	$(JANSSON_CFLAGS) \
-+	$(JSON_C_CFLAGS)
- 
- libguestfs_la_LIBADD = \
- 	../common/errnostring/liberrnostring.la \
-@@ -150,6 +151,7 @@ libguestfs_la_LIBADD = \
- 	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
- 	$(SELINUX_LIBS) \
- 	$(JANSSON_LIBS) \
-+	$(JSON_C_LIBS) \
- 	../gnulib/lib/libgnu.la \
- 	$(LIBSOCKET) \
- 	$(LIB_CLOCK_GETTIME) \
-diff --git a/lib/info.c b/lib/info.c
-index b60fc8b39..f325bfabc 100644
---- a/lib/info.c
-+++ b/lib/info.c
-@@ -37,42 +37,45 @@
- #include <sys/resource.h>
- #endif
- 
--#include <jansson.h>
-+#include <json.h>
- 
- #include "guestfs.h"
- #include "guestfs-internal.h"
- #include "guestfs-internal-actions.h"
- 
--#define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref)))
-+#define CLEANUP_JSON_OBJECT_PUT \
-+  __attribute__((cleanup(cleanup_json_object_put)))
- 
- static void
--cleanup_json_t_decref (void *ptr)
-+cleanup_json_object_put (void *ptr)
- {
--  json_decref (* (json_t **) ptr);
-+  json_object_put (* (json_object **) ptr);
- }
- 
--static json_t *get_json_output (guestfs_h *g, const char *filename);
-+static json_object *get_json_output (guestfs_h *g, const char *filename);
- static int qemu_img_supports_U_option (guestfs_h *g);
- static void set_child_rlimits (struct command *);
- 
- char *
- guestfs_impl_disk_format (guestfs_h *g, const char *filename)
- {
--  CLEANUP_JSON_T_DECREF json_t *tree = get_json_output (g, filename);
--  json_t *node;
-+  CLEANUP_JSON_OBJECT_PUT json_object *tree = get_json_output (g, filename);
-+  json_object *node;
-+  const char *format;
- 
-   if (tree == NULL)
-     return NULL;
- 
--  if (!json_is_object (tree))
-+  if (json_object_get_type (tree) != json_type_object)
-     goto bad_type;
- 
--  node = json_object_get (tree, "format");
--  if (!json_is_string (node))
-+  node = json_object_object_get (tree, "format");
-+  if (node == NULL)
-     goto bad_type;
- 
--  return safe_strndup (g, json_string_value (node),
--                          json_string_length (node)); /* caller frees */
-+  format = json_object_get_string (node);
-+
-+  return safe_strdup (g, format); /* caller frees */
- 
-  bad_type:
-   error (g, _("qemu-img info: JSON output did not contain ‘format’ key"));
-@@ -82,20 +85,20 @@ guestfs_impl_disk_format (guestfs_h *g, const char *filename)
- int64_t
- guestfs_impl_disk_virtual_size (guestfs_h *g, const char *filename)
- {
--  CLEANUP_JSON_T_DECREF json_t *tree = get_json_output (g, filename);
--  json_t *node;
-+  CLEANUP_JSON_OBJECT_PUT json_object *tree = get_json_output (g, filename);
-+  json_object *node;
- 
-   if (tree == NULL)
-     return -1;
- 
--  if (!json_is_object (tree))
-+  if (json_object_get_type (tree) != json_type_object)
-     goto bad_type;
- 
--  node = json_object_get (tree, "virtual-size");
--  if (!json_is_integer (node))
-+  node = json_object_object_get (tree, "virtual-size");
-+  if (node == NULL)
-     goto bad_type;
- 
--  return json_integer_value (node);
-+  return json_object_get_int64 (node);
- 
-  bad_type:
-   error (g, _("qemu-img info: JSON output did not contain ‘virtual-size’ key"));
-@@ -105,24 +108,18 @@ guestfs_impl_disk_virtual_size (guestfs_h *g, const char *filename)
- int
- guestfs_impl_disk_has_backing_file (guestfs_h *g, const char *filename)
- {
--  CLEANUP_JSON_T_DECREF json_t *tree = get_json_output (g, filename);
--  json_t *node;
-+  CLEANUP_JSON_OBJECT_PUT json_object *tree = get_json_output (g, filename);
-+  json_object *node;
- 
-   if (tree == NULL)
-     return -1;
- 
--  if (!json_is_object (tree))
-+  if (json_object_get_type (tree) != json_type_object)
-     goto bad_type;
- 
--  node = json_object_get (tree, "backing-filename");
-+  node = json_object_object_get (tree, "backing-filename");
-   if (node == NULL)
--    return 0; /* no backing-filename key means no backing file */
--
--  /* Work on the assumption that if this field is null, it means
--   * no backing file, rather than being an error.
--   */
--  if (json_is_null (node))
--    return 0;
-+    return 0; /* no backing-filename key or null means no backing file */
-   return 1;
- 
-  bad_type:
-@@ -136,12 +133,12 @@ guestfs_impl_disk_has_backing_file (guestfs_h *g, const char *filename)
- static void parse_json (guestfs_h *g, void *treevp, const char *input, size_t len);
- #define PARSE_JSON_NO_OUTPUT ((void *) -1)
- 
--static json_t *
-+static json_object *
- get_json_output (guestfs_h *g, const char *filename)
- {
-   CLEANUP_CMD_CLOSE struct command *cmd = guestfs_int_new_command (g);
-   int r;
--  json_t *tree = NULL;
-+  json_object *tree = NULL;
- 
-   guestfs_int_cmd_add_arg (cmd, "qemu-img");
-   guestfs_int_cmd_add_arg (cmd, "info");
-@@ -176,15 +173,16 @@ get_json_output (guestfs_h *g, const char *filename)
-     return NULL;
-   }
- 
--  return tree;          /* caller must call json_decref (tree) */
-+  return tree;          /* caller must call json_object_put (tree) */
- }
- 
- /* Parse the JSON document printed by qemu-img info --output json. */
- static void
- parse_json (guestfs_h *g, void *treevp, const char *input, size_t len)
- {
--  json_t **tree_ret = treevp;
--  json_error_t err;
-+  json_tokener *tok = NULL;
-+  json_object **tree_ret = treevp;
-+  enum json_tokener_error err;
- 
-   assert (*tree_ret == NULL);
- 
-@@ -197,15 +195,20 @@ parse_json (guestfs_h *g, void *treevp, const char *input, size_t len)
-     return;
-   }
- 
--  debug (g, "%s: qemu-img info JSON output:\n%.*s\n", __func__, (int) len, input);
-+  debug (g, "%s: qemu-img info JSON output:\n%.*s\n",
-+         __func__, (int) len, input);
- 
--  *tree_ret = json_loadb (input, len, 0, &err);
--  if (*tree_ret == NULL) {
--    if (strlen (err.text) > 0)
--      error (g, _("qemu-img info: JSON parse error: %s"), err.text);
--    else
--      error (g, _("qemu-img info: unknown JSON parse error"));
-+  tok = json_tokener_new ();
-+  json_tokener_set_flags (tok,
-+                          JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8);
-+  *tree_ret = json_tokener_parse_ex (tok, input, len);
-+  err = json_tokener_get_error (tok);
-+  if (err != json_tokener_success) {
-+    error (g, _("qemu-img info: JSON parse error: %s"),
-+           json_tokener_error_desc (err));
-+    *tree_ret = NULL;           /* should already be */
-   }
-+  json_tokener_free (tok);
- }
- 
- static void
--- 
-2.43.0
-
diff --git a/0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch b/0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch
deleted file mode 100644
index e9eea8a..0000000
--- a/0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 47857751a78108617e1e25d4949564bc2a182381 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 16:23:07 +0100
-Subject: [PATCH] lib: direct: Remove test for qemu mandatory locking
-
-We tested for QEMU >= 2.10 support for mandatory locking.  I believe
-this is for all practical purposes always enabled now (and qemu 2.10
-is ancient history) so simply assume it's true always.
----
- lib/guestfs-internal.h |  1 -
- lib/launch-direct.c    | 19 ++++++-----------
- lib/qemu.c             | 48 ------------------------------------------
- 3 files changed, 7 insertions(+), 61 deletions(-)
-
-diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
-index f9f4628aa..bb3772cb5 100644
---- a/lib/guestfs-internal.h
-+++ b/lib/guestfs-internal.h
-@@ -796,7 +796,6 @@ extern struct qemu_data *guestfs_int_test_qemu (guestfs_h *g);
- extern struct version guestfs_int_qemu_version (guestfs_h *g, struct qemu_data *);
- extern int guestfs_int_qemu_supports (guestfs_h *g, const struct qemu_data *, const char *option);
- extern int guestfs_int_qemu_supports_device (guestfs_h *g, const struct qemu_data *, const char *device_name);
--extern int guestfs_int_qemu_mandatory_locking (guestfs_h *g, const struct qemu_data *data);
- extern bool guestfs_int_platform_has_kvm (guestfs_h *g, const struct qemu_data *data);
- extern char *guestfs_int_drive_source_qemu_param (guestfs_h *g, const struct drive_source *src);
- extern bool guestfs_int_discard_possible (guestfs_h *g, struct drive *drv, const struct version *qemu_version);
-diff --git a/lib/launch-direct.c b/lib/launch-direct.c
-index cdfd25a9a..9d0c2215b 100644
---- a/lib/launch-direct.c
-+++ b/lib/launch-direct.c
-@@ -57,7 +57,6 @@ struct backend_direct_data {
-   pid_t recoverypid;            /* Recovery process PID. */
- 
-   struct version qemu_version;  /* qemu version (0 if unable to parse). */
--  int qemu_mandatory_locking;   /* qemu >= 2.10 does mandatory locking */
-   struct qemu_data *qemu_data;  /* qemu -help output etc. */
- 
-   char guestfsd_sock[UNIX_PATH_MAX]; /* Path to daemon socket. */
-@@ -240,13 +239,13 @@ add_drive_standard_params (guestfs_h *g, struct backend_direct_data *data,
-     }
-   }
-   else {
--    /* Writable qcow2 overlay on top of read-only drive. */
--    if (data->qemu_mandatory_locking &&
--	/* Add the file-specific locking option only for files, as
--	 * qemu won't accept options unknown to the block driver in
--	 * use.
--	 */
--	drv->src.protocol == drive_protocol_file) {
-+    /* Writable qcow2 overlay on top of read-only drive.
-+     *
-+     * Add the file-specific locking option only for files, as
-+     * qemu won't accept options unknown to the block driver in
-+     * use.
-+     */
-+    if (drv->src.protocol == drive_protocol_file) {
-       append_list_format ("file.file.filename=%s", drv->overlay);
-       append_list ("file.driver=qcow2");
-       append_list ("file.backing.file.locking=off");
-@@ -495,10 +494,6 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
-     data->qemu_version = guestfs_int_qemu_version (g, data->qemu_data);
-     debug (g, "qemu version: %d.%d",
-            data->qemu_version.v_major, data->qemu_version.v_minor);
--    data->qemu_mandatory_locking =
--      guestfs_int_qemu_mandatory_locking (g, data->qemu_data);
--    debug (g, "qemu mandatory locking: %s",
--           data->qemu_mandatory_locking ? "yes" : "no");
-   }
- 
-   /* Work out if KVM is supported or if the user wants to force TCG. */
-diff --git a/lib/qemu.c b/lib/qemu.c
-index 886c92e5d..f92707710 100644
---- a/lib/qemu.c
-+++ b/lib/qemu.c
-@@ -662,54 +662,6 @@ guestfs_int_qemu_supports_device (guestfs_h *g,
-   return strstr (data->qemu_devices, device_name) != NULL;
- }
- 
--/**
-- * Test if the qemu binary uses mandatory file locking, added in
-- * QEMU >= 2.10 (but sometimes disabled).
-- */
--int
--guestfs_int_qemu_mandatory_locking (guestfs_h *g,
--                                    const struct qemu_data *data)
--{
--  json_t *schema, *v, *meta_type, *members, *m, *name;
--  size_t i, j;
--
--  /* If there's no QMP schema, fall back to checking the version. */
--  if (!data->qmp_schema_tree) {
--  fallback:
--    return guestfs_int_version_ge (&data->qemu_version, 2, 10, 0);
--  }
--
--  /* Top element of qmp_schema_tree is the { "return": ... } wrapper.
--   * Extract the schema from the wrapper.  Note the returned ‘schema’
--   * will be an array.
--   */
--  schema = json_object_get (data->qmp_schema_tree, "return");
--  if (!json_is_array (schema))
--    goto fallback;
--
--  /* Now look for any member of the array which has:
--   * { "meta-type": "object",
--   *   "members": [ ... { "name": "locking", ... } ... ] ... }
--   */
--  json_array_foreach (schema, i, v) {
--    meta_type = json_object_get (v, "meta-type");
--    if (json_is_string (meta_type) &&
--        STREQ (json_string_value (meta_type), "object")) {
--      members = json_object_get (v, "members");
--      if (json_is_array (members)) {
--        json_array_foreach (members, j, m) {
--          name = json_object_get (m, "name");
--          if (json_is_string (name) &&
--              STREQ (json_string_value (name), "locking"))
--            return 1;
--        }
--      }
--    }
--  }
--
--  return 0;
--}
--
- bool
- guestfs_int_platform_has_kvm (guestfs_h *g, const struct qemu_data *data)
- {
--- 
-2.43.0
-
diff --git a/0012-lib-qemu.c-Replace-jansson-with-json-c.patch b/0012-lib-qemu.c-Replace-jansson-with-json-c.patch
deleted file mode 100644
index e189b5e..0000000
--- a/0012-lib-qemu.c-Replace-jansson-with-json-c.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From 9e3c1f44cafc2ce568462fcedc0033cab7d94cae Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 16:24:30 +0100
-Subject: [PATCH] lib/qemu.c: Replace jansson with json-c
-
----
- lib/qemu.c | 73 ++++++++++++++++++++++++++++--------------------------
- 1 file changed, 38 insertions(+), 35 deletions(-)
-
-diff --git a/lib/qemu.c b/lib/qemu.c
-index f92707710..1d7f45f00 100644
---- a/lib/qemu.c
-+++ b/lib/qemu.c
-@@ -37,7 +37,7 @@
- 
- #include <libxml/uri.h>
- 
--#include <jansson.h>
-+#include <json.h>
- 
- #include "full-write.h"
- #include "ignore-value.h"
-@@ -46,12 +46,13 @@
- #include "guestfs-internal.h"
- #include "guestfs_protocol.h"
- 
--#define CLEANUP_JSON_T_DECREF __attribute__((cleanup(cleanup_json_t_decref)))
-+#define CLEANUP_JSON_OBJECT_PUT \
-+  __attribute__((cleanup(cleanup_json_object_put)))
- 
- static void
--cleanup_json_t_decref (void *ptr)
-+cleanup_json_object_put (void *ptr)
- {
--  json_decref (* (json_t **) ptr);
-+  json_object_put (* (json_object **) ptr);
- }
- 
- struct qemu_data {
-@@ -66,7 +67,7 @@ struct qemu_data {
- 
-   /* The following fields are derived from the fields above. */
-   struct version qemu_version;  /* Parsed qemu version number. */
--  json_t *qmp_schema_tree;      /* qmp_schema parsed into a JSON tree */
-+  json_object *qmp_schema_tree; /* qmp_schema parsed into a JSON tree */
-   bool has_kvm;                 /* If KVM is available. */
- };
- 
-@@ -86,7 +87,7 @@ static int write_cache_query_kvm (guestfs_h *g, const struct qemu_data *data, co
- static int read_cache_qemu_stat (guestfs_h *g, struct qemu_data *data, const char *filename);
- static int write_cache_qemu_stat (guestfs_h *g, const struct qemu_data *data, const char *filename);
- static void parse_qemu_version (guestfs_h *g, const char *, struct version *qemu_version);
--static void parse_json (guestfs_h *g, const char *, json_t **);
-+static void parse_json (guestfs_h *g, const char *, json_object **);
- static void parse_has_kvm (guestfs_h *g, const char *, bool *);
- static void read_all (guestfs_h *g, void *retv, const char *buf, size_t len);
- static int generic_read_cache (guestfs_h *g, const char *filename, char **strp);
-@@ -442,20 +443,24 @@ parse_qemu_version (guestfs_h *g, const char *qemu_help,
-  * is not possible.
-  */
- static void
--parse_json (guestfs_h *g, const char *json, json_t **treep)
-+parse_json (guestfs_h *g, const char *json, json_object **treep)
- {
--  json_error_t err;
-+  json_tokener *tok;
-+  enum json_tokener_error err;
- 
-   if (!json)
-     return;
- 
--  *treep = json_loads (json, 0, &err);
--  if (*treep == NULL) {
--    if (strlen (err.text) > 0)
--      debug (g, "QMP parse error: %s (ignored)", err.text);
--    else
--      debug (g, "QMP unknown parse error (ignored)");
--  }
-+  tok = json_tokener_new ();
-+  json_tokener_set_flags (tok,
-+                          JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8);
-+  *treep = json_tokener_parse_ex (tok, json, strlen (json));
-+  err = json_tokener_get_error (tok);
-+  if (err != json_tokener_success)
-+    debug (g, "QMP parse error: %s (ignored)", json_tokener_error_desc (err));
-+  json_tokener_free (tok);
-+
-+  /* Caller should do json_object_put (*treep) */
- }
- 
- /**
-@@ -469,37 +474,35 @@ parse_json (guestfs_h *g, const char *json, json_t **treep)
- static void
- parse_has_kvm (guestfs_h *g, const char *json, bool *ret)
- {
--  CLEANUP_JSON_T_DECREF json_t *tree = NULL;
--  json_error_t err;
--  json_t *return_node, *enabled_node;
-+  CLEANUP_JSON_OBJECT_PUT json_object *tree = NULL;
-+  json_tokener *tok;
-+  enum json_tokener_error err;
-+  json_object *return_node, *enabled_node;
- 
-   *ret = true;                  /* Assume KVM is enabled. */
- 
-   if (!json)
-     return;
- 
--  tree = json_loads (json, 0, &err);
--  if (tree == NULL) {
--    if (strlen (err.text) > 0)
--      debug (g, "QMP parse error: %s (ignored)", err.text);
--    else
--      debug (g, "QMP unknown parse error (ignored)");
-+  tok = json_tokener_new ();
-+  json_tokener_set_flags (tok,
-+                          JSON_TOKENER_STRICT | JSON_TOKENER_VALIDATE_UTF8);
-+  tree = json_tokener_parse_ex (tok, json, strlen (json));
-+  err = json_tokener_get_error (tok);
-+  if (err != json_tokener_success) {
-+    debug (g, "QMP parse error: %s (ignored)", json_tokener_error_desc (err));
-+    json_tokener_free (tok);
-     return;
-   }
-+  json_tokener_free (tok);
- 
--  return_node = json_object_get (tree, "return");
--  if (!json_is_object (return_node)) {
-+  return_node = json_object_object_get (tree, "return");
-+  if (json_object_get_type (return_node) != json_type_object) {
-     debug (g, "QMP query-kvm: no \"return\" node (ignored)");
-     return;
-   }
--  enabled_node = json_object_get (return_node, "enabled");
--  /* Note that json_is_boolean will check that enabled_node != NULL. */
--  if (!json_is_boolean (enabled_node)) {
--    debug (g, "QMP query-kvm: no \"enabled\" node or not a boolean (ignored)");
--    return;
--  }
--
--  *ret = json_is_true (enabled_node);
-+  enabled_node = json_object_object_get (return_node, "enabled");
-+  *ret = json_object_get_boolean (enabled_node);
- }
- 
- /**
-@@ -975,7 +978,7 @@ guestfs_int_free_qemu_data (struct qemu_data *data)
-     free (data->qemu_devices);
-     free (data->qmp_schema);
-     free (data->query_kvm);
--    json_decref (data->qmp_schema_tree);
-+    json_object_put (data->qmp_schema_tree);
-     free (data);
-   }
- }
--- 
-2.43.0
-
diff --git a/0013-build-Remove-Jansson-dependency.patch b/0013-build-Remove-Jansson-dependency.patch
deleted file mode 100644
index d77be34..0000000
--- a/0013-build-Remove-Jansson-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 9255abee029e35dd5c6783b8b6037eb71104650c Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 15:22:18 +0100
-Subject: [PATCH] build: Remove Jansson dependency
-
-After previous changes, this library is no longer used.  We have
-switched to json-c, for better compatibility with libvirt.
-
-(cherry picked from
-guestfs-tools commit e6dcf7e3a7e9170978e57ce6df1b34f92fac5ae3)
----
- docs/guestfs-building.pod | 4 ----
- lib/Makefile.am           | 2 --
- m4/guestfs-libraries.m4   | 3 ---
- 3 files changed, 9 deletions(-)
-
-diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
-index de175aaff..aef716ffc 100644
---- a/docs/guestfs-building.pod
-+++ b/docs/guestfs-building.pod
-@@ -185,10 +185,6 @@ I<Required>.
- 
- I<Required>.
- 
--=item Jansson E<ge> 2.7
--
--I<Required>.
--
- =item json-c E<ge> 0.14
- 
- I<Required>.
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 60567b04b..6949884d5 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -138,7 +138,6 @@ libguestfs_la_CFLAGS = \
- 	$(PCRE2_CFLAGS) \
- 	$(LIBVIRT_CFLAGS) \
- 	$(LIBXML2_CFLAGS) \
--	$(JANSSON_CFLAGS) \
- 	$(JSON_C_CFLAGS)
- 
- libguestfs_la_LIBADD = \
-@@ -150,7 +149,6 @@ libguestfs_la_LIBADD = \
- 	$(PCRE2_LIBS) \
- 	$(LIBVIRT_LIBS) $(LIBXML2_LIBS) \
- 	$(SELINUX_LIBS) \
--	$(JANSSON_LIBS) \
- 	$(JSON_C_LIBS) \
- 	../gnulib/lib/libgnu.la \
- 	$(LIBSOCKET) \
-diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
-index ee406d273..515651717 100644
---- a/m4/guestfs-libraries.m4
-+++ b/m4/guestfs-libraries.m4
-@@ -301,9 +301,6 @@ LIBS="$LIBS $LIBXML2_LIBS"
- AC_CHECK_FUNCS([xmlBufferDetach])
- LIBS="$old_LIBS"
- 
--dnl Check for Jansson JSON library (required).
--PKG_CHECK_MODULES([JANSSON], [jansson >= 2.7])
--
- dnl Check for JSON-C library (required).
- PKG_CHECK_MODULES([JSON_C], [json-c >= 0.14])
- 
--- 
-2.43.0
-
diff --git a/0014-website-Fix-link-to-latest-development-version.patch b/0014-website-Fix-link-to-latest-development-version.patch
deleted file mode 100644
index 4646459..0000000
--- a/0014-website-Fix-link-to-latest-development-version.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4ea26a26557e0e648477526bae2313275e975f20 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 22 Oct 2024 17:44:06 +0100
-Subject: [PATCH] website: Fix link to latest development version
-
-Fixes: commit 0edaea8f91bf08025651eeff32f53b9335003842
----
- website/index.html.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/website/index.html.in b/website/index.html.in
-index 2a0d32217..13c5ff25f 100644
---- a/website/index.html.in
-+++ b/website/index.html.in
-@@ -183,7 +183,7 @@ git clone <a href="https://github.com/libguestfs/libguestfs">https://github.com/
- <p class="latest">
- <em><small>
-   <!--
--LATEST-URL: http://libguestfs.org/download/1.53-development/libguestfs-@PACKAGE_VERSION@.tar.gz
-+LATEST-URL: http://libguestfs.org/download/1.55-development/libguestfs-@PACKAGE_VERSION@.tar.gz
- LATEST-VERSION: @PACKAGE_VERSION@
-   -->
-   <a href="download/1.55-development/">Latest development version: <strong>@PACKAGE_VERSION@</strong></a> (released <strong>@RELEASE_DATE@</strong>).<br/>
--- 
-2.43.0
-
diff --git a/copy-patches.sh b/copy-patches.sh
index 4d67ee7..8b312fd 100755
--- a/copy-patches.sh
+++ b/copy-patches.sh
@@ -7,7 +7,7 @@ set -e
 # it like this:
 #   ./copy-patches.sh
 
-rhel_version=10.0
+rhel_version=10.1
 
 # Check we're in the right directory.
 if [ ! -f libguestfs.spec ]; then
diff --git a/libguestfs.spec b/libguestfs.spec
index d8fbc44..5ace102 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ ExcludeArch: %{ix86}
 %global verify_tarball_signature 1
 
 # The source directory.
-%global source_directory 1.54-stable
+%global source_directory 1.55-development
 
 # Filter perl provides.
 %{?perl_default_filter}
@@ -41,8 +41,8 @@ ExcludeArch: %{ix86}
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.54.0
-Release:       5%{?dist}
+Version:       1.55.6
+Release:       1%{?dist}
 License:       LGPL-2.1-or-later
 
 # Build only for architectures that have a kernel
@@ -77,25 +77,13 @@ Source7:       libguestfs.keyring
 Source8:       copy-patches.sh
 
 # Patches are maintained in the following repository:
-# https://github.com/libguestfs/libguestfs/commits/rhel-10.0
+# https://github.com/libguestfs/libguestfs/commits/rhel-10.1
 
 # Patches.
-Patch0001:     0001-website-Add-links-for-1.54-and-1.55-download-locatio.patch
-Patch0002:     0002-tests-gdisk-test-expand-gpt.pl-Implement-SKIP-rule-f.patch
-Patch0003:     0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch
-Patch0004:     0004-build-Assume-__attribute__-cleanup-always-works.patch
-Patch0005:     0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch
-Patch0006:     0006-appliance-Refactor-the-TAR_COMMAND-macro.patch
-Patch0007:     0007-build-Add-new-dependency-on-json-c.patch
-Patch0008:     0008-daemon-ldm.c-Replace-jansson-with-json-c.patch
-#Patch0009:     0009-common-Update-common-submodule.patch
-Patch0010:     0010-lib-info.c-Replace-jansson-with-json-c.patch
-Patch0011:     0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch
-Patch0012:     0012-lib-qemu.c-Replace-jansson-with-json-c.patch
-Patch0013:     0013-build-Remove-Jansson-dependency.patch
-Patch0014:     0014-website-Fix-link-to-latest-development-version.patch
-Patch0015:     0015-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
-Patch0016:     0016-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+Patch0001:     0001-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
+Patch0002:     0002-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
+Patch0003:     0003-lib-Print-kernel-utsname-in-debug-output.patch
+Patch0004:     0004-daemon-Fix-loongarch64-detection-on-RHEL-9.patch
 
 BuildRequires: autoconf, automake, libtool, gettext-devel
 
@@ -162,7 +150,7 @@ BuildRequires: gnupg2
 %endif
 
 # For language bindings.
-BuildRequires: ocaml
+BuildRequires: ocaml >= 4.08
 BuildRequires: ocaml-ocamldoc
 BuildRequires: ocaml-findlib-devel
 %if !0%{?rhel}
@@ -1125,6 +1113,12 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Tue Mar 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:1.55.6-1
+- Rebase to libguestfs 1.55.6
+  resolves: RHEL-81733
+- Include host kernel information in libguestfs debugging output
+  resolves: RHEL-83026
+
 * Tue Nov 26 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.54.0-5
 - Rebase to libguestfs 1.54.0
   resolves: RHEL-56810
diff --git a/sources b/sources
index e8f63e9..6e57975 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86
-SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3
+SHA512 (libguestfs-1.55.6.tar.gz) = 3dba2f8c2086024674375d054a214d34a028345e2f32cf439de38dfe2815ab2cc6cc64cff58b59ed2f38712006e1563fdf58713ccecfe155b7542742a4ee5104
+SHA512 (libguestfs-1.55.6.tar.gz.sig) = db4c89e918b2404f511734d34c98aedd58c3b1446d8831c7793958e1f70d24fe5378b331d015b53ad7f90ec04c9aa98fe7d6390b08e80fdac19691a4e30b95dd