48 changed files with 9385 additions and 4294 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,2 @@
-*~
+SOURCES/libguestfs-1.44.0.tar.gz
-.build*.log
+SOURCES/libguestfs.keyring
 *.rpm
 clog
 /x86_64/
 /i386/
 /noarch/
 /libguestfs-*.tar.gz
 /libguestfs-*.tar.gz.sig
--- a/.libguestfs.metadata
+++ b/.libguestfs.metadata
@ -0,0 +1,2 @@
 99d241dc4a5ba0dc6111954ed7a872e0b0bb6944 SOURCES/libguestfs-1.44.0.tar.gz
 1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
--- 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
@ -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
--- 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
@ -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
--- a/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch
+++ b/0003-lib-inspect-osinfo.c-Add-Windows-Server-2025-osinfo.patch
@ -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
--- a/0004-build-Assume-attribute-cleanup-always-works.patch
+++ b/0004-build-Assume-attribute-cleanup-always-works.patch
@ -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
--- a/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch
+++ b/0005-appliance-Use-stable-owner-group-and-mtime-in-applia.patch
@ -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
--- a/0006-appliance-Refactor-the-TAR_COMMAND-macro.patch
+++ b/0006-appliance-Refactor-the-TAR_COMMAND-macro.patch
@ -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
--- a/0007-build-Add-new-dependency-on-json-c.patch
+++ b/0007-build-Add-new-dependency-on-json-c.patch
@ -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
--- a/0008-daemon-ldm.c-Replace-jansson-with-json-c.patch
+++ b/0008-daemon-ldm.c-Replace-jansson-with-json-c.patch
@ -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
--- a/0010-lib-info.c-Replace-jansson-with-json-c.patch
+++ b/0010-lib-info.c-Replace-jansson-with-json-c.patch
@ -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
--- a/0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch
+++ b/0011-lib-direct-Remove-test-for-qemu-mandatory-locking.patch
@ -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
--- a/0012-lib-qemu.c-Replace-jansson-with-json-c.patch
+++ b/0012-lib-qemu.c-Replace-jansson-with-json-c.patch
@ -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
--- a/0013-build-Remove-Jansson-dependency.patch
+++ b/0013-build-Remove-Jansson-dependency.patch
@ -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
--- a/0014-website-Fix-link-to-latest-development-version.patch
+++ b/0014-website-Fix-link-to-latest-development-version.patch
@ -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
--- a/SOURCES/0001-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
+++ b/SOURCES/0001-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
@ -0,0 +1,56 @@
 From 5b6d2b05fe0c4035b9791a751e3133d26c7baa2d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 21 Dec 2012 15:50:11 +0000
 Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980).
 This isn't supported in RHEL 8.
 Disable daemon tests that require the 'unix' backend.
 ---
 lib/launch-unix.c        | 7 +++++++
 tests/daemon/Makefile.am | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)
 diff --git a/lib/launch-unix.c b/lib/launch-unix.c
 index 0d344f9df..74dd1bb4a 100644
 --- a/lib/launch-unix.c
 +++ b/lib/launch-unix.c
@@ -37,6 +37,12 @@
 static int
 launch_unix (guestfs_h *g, void *datav, const char *sockpath)
 {
 +  error (g,
 +	 "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
 +	 "In particular, \"libguestfs live\" is not supported.");
 +  return -1;
 +
 +#if 0
   int r, daemon_sock = -1;
   struct sockaddr_un addr;
   uint32_t size;
@@ -106,6 +112,7 @@ launch_unix (guestfs_h *g, void *datav, const char *sockpath)
     g->conn = NULL;
   }
   return -1;
 +#endif
 }
 static int
 diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
 index 921e6d1df..8b2887247 100644
 --- a/tests/daemon/Makefile.am
 +++ b/tests/daemon/Makefile.am
@@ -23,9 +23,7 @@ include $(top_srcdir)/subdir-rules.mk
 check_DATA = captive-daemon.pm
 -TESTS = \
 -	test-daemon-start.pl \
 -	test-btrfs.pl
 +TESTS =
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
 -- 
 2.31.1
--- a/SOURCES/0002-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
+++ b/SOURCES/0002-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
@ -0,0 +1,330 @@
 From 91b2a6e50211c58ea31a36351ec63c358f708bf9 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 18 Jul 2013 18:31:53 +0100
 Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710).
 ---
 Makefile.am               |   2 +-
 daemon/9p.c               | 182 --------------------------------------
 daemon/Makefile.am        |   1 -
 docs/C_SOURCE_FILES       |   1 -
 generator/actions_core.ml |  21 -----
 generator/proc_nr.ml      |   2 -
 gobject/Makefile.inc      |   2 -
 po/POTFILES               |   2 -
 8 files changed, 1 insertion(+), 212 deletions(-)
 delete mode 100644 daemon/9p.c
 diff --git a/Makefile.am b/Makefile.am
 index 3df1b6a7a..36e44dfd5 100644
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -78,7 +78,7 @@ SUBDIRS += tests/xfs
 SUBDIRS += tests/charsets
 SUBDIRS += tests/xml
 SUBDIRS += tests/mount-local
 -SUBDIRS += tests/9p
 +#SUBDIRS += tests/9p
 SUBDIRS += tests/rsync
 SUBDIRS += tests/bigdirs
 SUBDIRS += tests/disk-labels
 diff --git a/daemon/9p.c b/daemon/9p.c
 deleted file mode 100644
 index 743a96abd..000000000
 --- a/daemon/9p.c
 +++ /dev/null
@@ -1,182 +0,0 @@
 -/* libguestfs - the guestfsd daemon
 - * Copyright (C) 2011 Red Hat Inc.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License as published by
 - * the Free Software Foundation; either version 2 of the License, or
 - * (at your option) any later version.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
 - * You should have received a copy of the GNU General Public License
 - * along with this program; if not, write to the Free Software
 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 - */
 -
 -#include <config.h>
 -
 -#include <stdio.h>
 -#include <stdlib.h>
 -#include <string.h>
 -#include <unistd.h>
 -#include <limits.h>
 -#include <errno.h>
 -#include <sys/types.h>
 -#include <sys/stat.h>
 -#include <dirent.h>
 -#include <fcntl.h>
 -
 -#include "ignore-value.h"
 -
 -#include "daemon.h"
 -#include "actions.h"
 -
 -#define BUS_PATH "/sys/bus/virtio/drivers/9pnet_virtio"
 -
 -static void
 -modprobe_9pnet_virtio (void)
 -{
 -  /* Required with Linux 5.6 and maybe earlier kernels.  For unclear
 -   * reasons the module is not an automatic dependency of the 9p
 -   * module so doesn't get loaded automatically.
 -   */
 -  ignore_value (command (NULL, NULL, "modprobe", "9pnet_virtio", NULL));
 -}
 -
 -/* https://bugzilla.redhat.com/show_bug.cgi?id=714981#c1 */
 -char **
 -do_list_9p (void)
 -{
 -  CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (r);
 -  DIR *dir;
 -
 -  modprobe_9pnet_virtio ();
 -
 -  dir = opendir (BUS_PATH);
 -  if (!dir) {
 -    perror ("opendir: " BUS_PATH);
 -    if (errno != ENOENT) {
 -      reply_with_perror ("opendir: " BUS_PATH);
 -      return NULL;
 -    }
 -
 -    /* If this directory doesn't exist, it probably means that
 -     * the virtio driver isn't loaded.  Don't return an error
 -     * in this case, but return an empty list.
 -     */
 -    if (end_stringsbuf (&r) == -1)
 -      return NULL;
 -
 -    return take_stringsbuf (&r);
 -  }
 -
 -  while (1) {
 -    struct dirent *d;
 -
 -    errno = 0;
 -    d = readdir (dir);
 -    if (d == NULL) break;
 -
 -    if (STRPREFIX (d->d_name, "virtio")) {
 -      CLEANUP_FREE char *mount_tag_path = NULL;
 -      if (asprintf (&mount_tag_path, BUS_PATH "/%s/mount_tag",
 -                    d->d_name) == -1) {
 -        reply_with_perror ("asprintf");
 -        closedir (dir);
 -        return NULL;
 -      }
 -
 -      /* A bit unclear, but it looks like the virtio transport allows
 -       * the mount tag length to be unlimited (or up to 65536 bytes).
 -       * See: linux/include/linux/virtio_9p.h
 -       */
 -      CLEANUP_FREE char *mount_tag = read_whole_file (mount_tag_path, NULL);
 -      if (mount_tag == 0)
 -        continue;
 -
 -      if (add_string (&r, mount_tag) == -1) {
 -        closedir (dir);
 -        return NULL;
 -      }
 -    }
 -  }
 -
 -  /* Check readdir didn't fail */
 -  if (errno != 0) {
 -    reply_with_perror ("readdir: /sys/block");
 -    closedir (dir);
 -    return NULL;
 -  }
 -
 -  /* Close the directory handle */
 -  if (closedir (dir) == -1) {
 -    reply_with_perror ("closedir: /sys/block");
 -    return NULL;
 -  }
 -
 -  /* Sort the tags. */
 -  if (r.size > 0)
 -    sort_strings (r.argv, r.size);
 -
 -  /* NULL terminate the list */
 -  if (end_stringsbuf (&r) == -1)
 -    return NULL;
 -
 -  return take_stringsbuf (&r);
 -}
 -
 -/* Takes optional arguments, consult optargs_bitmask. */
 -int
 -do_mount_9p (const char *mount_tag, const char *mountpoint, const char *options)
 -{
 -  CLEANUP_FREE char *mp = NULL, *opts = NULL, *err = NULL;
 -  struct stat statbuf;
 -  int r;
 -
 -  ABS_PATH (mountpoint, 0, return -1);
 -
 -  mp = sysroot_path (mountpoint);
 -  if (!mp) {
 -    reply_with_perror ("malloc");
 -    return -1;
 -  }
 -
 -  /* Check the mountpoint exists and is a directory. */
 -  if (stat (mp, &statbuf) == -1) {
 -    reply_with_perror ("%s", mountpoint);
 -    return -1;
 -  }
 -  if (!S_ISDIR (statbuf.st_mode)) {
 -    reply_with_perror ("%s: mount point is not a directory", mountpoint);
 -    return -1;
 -  }
 -
 -  /* Add trans=virtio to the options. */
 -  if ((optargs_bitmask & GUESTFS_MOUNT_9P_OPTIONS_BITMASK) &&
 -      STRNEQ (options, "")) {
 -    if (asprintf (&opts, "trans=virtio,%s", options) == -1) {
 -      reply_with_perror ("asprintf");
 -      return -1;
 -    }
 -  }
 -  else {
 -    opts = strdup ("trans=virtio");
 -    if (opts == NULL) {
 -      reply_with_perror ("strdup");
 -      return -1;
 -    }
 -  }
 -
 -  modprobe_9pnet_virtio ();
 -  r = command (NULL, &err,
 -               "mount", "-o", opts, "-t", "9p", mount_tag, mp, NULL);
 -  if (r == -1) {
 -    reply_with_error ("%s on %s: %s", mount_tag, mountpoint, err);
 -    return -1;
 -  }
 -
 -  return 0;
 -}
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
 index 038be592c..df9dcc4ee 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
@@ -82,7 +82,6 @@ guestfsd_SOURCES = \
 	../common/protocol/guestfs_protocol.h \
 	../common/utils/cleanups.h \
 	../common/utils/guestfs-utils.h \
 -	9p.c \
 	acl.c \
 	actions.h \
 	available.c \
 diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
 index cd5bd2924..831b7e25a 100644
 --- a/docs/C_SOURCE_FILES
 +++ b/docs/C_SOURCE_FILES
@@ -63,7 +63,6 @@ common/windows/windows.c
 common/windows/windows.h
 customize/crypt-c.c
 customize/perl_edit-c.c
 -daemon/9p.c
 daemon/acl.c
 daemon/actions.h
 daemon/augeas.c
 diff --git a/generator/actions_core.ml b/generator/actions_core.ml
 index 806565b19..37476c93e 100644
 --- a/generator/actions_core.ml
 +++ b/generator/actions_core.ml
@@ -6157,27 +6157,6 @@ This returns true iff the device exists and contains all zero bytes.
 Note that for large devices this can take a long time to run." };
 -  { defaults with
 -    name = "list_9p"; added = (1, 11, 12);
 -    style = RStringList (RPlainString, "mounttags"), [], [];
 -    shortdesc = "list 9p filesystems";
 -    longdesc = "\
 -List all 9p filesystems attached to the guest.  A list of
 -mount tags is returned." };
 -
 -  { defaults with
 -    name = "mount_9p"; added = (1, 11, 12);
 -    style = RErr, [String (PlainString, "mounttag"); String (PlainString, "mountpoint")], [OString "options"];
 -    camel_name = "Mount9P";
 -    shortdesc = "mount 9p filesystem";
 -    longdesc = "\
 -Mount the virtio-9p filesystem with the tag C<mounttag> on the
 -directory C<mountpoint>.
 -
 -If required, C<trans=virtio> will be automatically added to the options.
 -Any other options required can be passed in the optional C<options>
 -parameter." };
 -
   { defaults with
     name = "list_dm_devices"; added = (1, 11, 15);
     style = RStringList (RDevice, "devices"), [], [];
 diff --git a/generator/proc_nr.ml b/generator/proc_nr.ml
 index 30e42864f..57976be36 100644
 --- a/generator/proc_nr.ml
 +++ b/generator/proc_nr.ml
@@ -295,8 +295,6 @@ let proc_nr = [
 282, "internal_autosync";
 283, "is_zero";
 284, "is_zero_device";
 -285, "list_9p";
 -286, "mount_9p";
 287, "list_dm_devices";
 288, "ntfsresize";
 289, "btrfs_filesystem_resize";
 diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc
 index 650f8ddac..c4e735967 100644
 --- a/gobject/Makefile.inc
 +++ b/gobject/Makefile.inc
@@ -94,7 +94,6 @@ guestfs_gobject_headers= \
   include/guestfs-gobject/optargs-mksquashfs.h \
   include/guestfs-gobject/optargs-mkswap.h \
   include/guestfs-gobject/optargs-mktemp.h \
 -  include/guestfs-gobject/optargs-mount_9p.h \
   include/guestfs-gobject/optargs-mount_local.h \
   include/guestfs-gobject/optargs-ntfsclone_out.h \
   include/guestfs-gobject/optargs-ntfsfix.h \
@@ -188,7 +187,6 @@ guestfs_gobject_sources= \
   src/optargs-mksquashfs.c \
   src/optargs-mkswap.c \
   src/optargs-mktemp.c \
 -  src/optargs-mount_9p.c \
   src/optargs-mount_local.c \
   src/optargs-ntfsclone_out.c \
   src/optargs-ntfsfix.c \
 diff --git a/po/POTFILES b/po/POTFILES
 index 69ea7134a..0782e8ceb 100644
 --- a/po/POTFILES
 +++ b/po/POTFILES
@@ -47,7 +47,6 @@ common/visit/visit.c
 common/windows/windows.c
 customize/crypt-c.c
 customize/perl_edit-c.c
 -daemon/9p.c
 daemon/acl.c
 daemon/augeas.c
 daemon/available.c
@@ -277,7 +276,6 @@ gobject/src/optargs-mkfs_btrfs.c
 gobject/src/optargs-mksquashfs.c
 gobject/src/optargs-mkswap.c
 gobject/src/optargs-mktemp.c
 -gobject/src/optargs-mount_9p.c
 gobject/src/optargs-mount_local.c
 gobject/src/optargs-ntfsclone_out.c
 gobject/src/optargs-ntfsfix.c
 -- 
 2.31.1
--- a/SOURCES/0003-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
+++ b/SOURCES/0003-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
@ -1,7 +1,7 @@
-From c508b3390245bbecfa8acf785b7d7bfd215859ae Mon Sep 17 00:00:00 2001
+From 4dd2f3f56a39411a255ad0a8f38081d46620dbd8 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
+Subject: [PATCH] RHEL 8: Disable unsupported remote drive protocols
 (RHBZ#962113).
 This disables support for unsupported remote drive protocols:
@ -10,23 +10,28 @@ This disables support for unsupported remote drive protocols:
 * ftps
 * http
 * https
 * tftp
 * gluster
 * iscsi
 * sheepdog
 * ssh
 Note 'nbd' is not disabled, and of course 'file' works.
 We hope to gradually add some of these back over the lifetime of RHEL 8.
 ---
 docs/guestfs-testing.pod               |  20 -----
- fish/guestfish.pod                     |  42 ++-------
+ fish/guestfish.pod                     |  66 ++--------------
- fish/test-add-uri.sh                   |  21 -----
+ fish/test-add-uri.sh                   |  32 --------
- generator/actions_core.ml              |  34 +-------
+ generator/actions_core.ml              |  50 +------------
- lib/drives.c                           | 113 -------------------------
+ lib/drives.c                           |   8 ++
- lib/guestfs.pod                        |  67 ---------------
+ lib/guestfs.pod                        | 100 -------------------------
- tests/disks/test-qemu-drive-libvirt.sh |   7 --
+ tests/disks/test-qemu-drive-libvirt.sh |  28 -------
- tests/disks/test-qemu-drive.sh         |  40 ---------
+ tests/disks/test-qemu-drive.sh         |  60 ---------------
- 8 files changed, 8 insertions(+), 336 deletions(-)
+ 8 files changed, 16 insertions(+), 348 deletions(-)
 diff --git a/docs/guestfs-testing.pod b/docs/guestfs-testing.pod
-index f5c09df6e..ee4b26d6b 100644
+index f558964bf..8f264ed17 100644
 --- a/docs/guestfs-testing.pod
 +++ b/docs/guestfs-testing.pod
@@ -109,26 +109,6 @@ image.  To exit, type C<exit>.
@ -57,7 +62,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 9f086f110..bb4167b06 100644
 --- a/fish/guestfish.pod
 +++ b/fish/guestfish.pod
@@ -131,9 +131,9 @@ To list what is available do:
@ -72,7 +77,7 @@ index da47c86d6..33fc8b2c8 100644
 =head2 Remote control
-@@ -1129,12 +1129,12 @@ L<guestfs(3)/REMOTE STORAGE>>.
+@@ -1134,12 +1134,12 @@ L<guestfs(3)/REMOTE STORAGE>>.
 On the command line, you can use the I<-a> option to add network
 block devices using a URI-style format, for example:
@ -87,7 +92,7 @@ index da47c86d6..33fc8b2c8 100644
 The possible I<-a URI> formats are described below.
-@@ -1144,28 +1144,6 @@ The possible I<-a URI> formats are described below.
+@@ -1149,40 +1149,6 @@ The possible I<-a URI> formats are described below.
 Add the local disk image (or device) called F<disk.img>.
@ -99,12 +104,24 @@ index da47c86d6..33fc8b2c8 100644
 -
 -=head2 B<-a https://[user@]example.com[:port]/disk.img>
 -
-Add a disk located on a remote FTP or HTTP server.
+-=head2 B<-a tftp://[user@]example.com[:port]/disk.img>
 -
 -Add a disk located on a remote FTP, HTTP or TFTP server.
 -
 -The equivalent API command would be:
 -
 - ><fs> add /disk.img protocol:(ftp|...) server:tcp:example.com
 -
 -=head2 B<-a gluster://example.com[:port]/volname/image>
 -
 -Add a disk image located on GlusterFS storage.
 -
 -The server is the one running C<glusterd>, and may be C<localhost>.
 -
 -The equivalent API command would be:
 -
 - ><fs> add volname/image protocol:gluster server:tcp:example.com
 -
 -=head2 B<-a iscsi://example.com[:port]/target-iqn-name[/lun]>
 -
 -Add a disk located on an iSCSI server.
@ -116,10 +133,22 @@ index da47c86d6..33fc8b2c8 100644
 =head2 B<-a nbd://example.com[:port]>
 =head2 B<-a nbd://example.com[:port]/exportname>
-@@ -1200,23 +1178,13 @@ The equivalent API command would be:
+@@ -1217,35 +1183,13 @@ The equivalent API command would be:
  ><fs> add pool/disk protocol:rbd server:tcp:example.com:port
 -=head2 B<-a sheepdog://[example.com[:port]]/volume/image>
 -
 -Add a disk image located on a Sheepdog volume.
 -
 -The server name is optional.  Although libguestfs and Sheepdog
 -supports multiple servers, only at most one server can be specified
 -when using this URI syntax.
 -
 -The equivalent API command would be:
 -
 - ><fs> add volume protocol:sheepdog [server:tcp:example.com]
 -
 -=head2 B<-a ssh://[user@]example.com[:port]/disk.img>
 -
 -Add a disk image located on a remote server, accessed using the Secure
@ -142,24 +171,35 @@ 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 21d424984..ddabeb639 100755
 --- a/fish/test-add-uri.sh
 +++ b/fish/test-add-uri.sh
-@@ -40,10 +40,6 @@ function fail ()
+@@ -40,14 +40,6 @@ function fail ()
 $VG guestfish -x -a file://$abs_builddir/test-add-uri.img </dev/null >test-add-uri.out 2>&1
 grep -sq 'add_drive ".*/test-add-uri.img"' test-add-uri.out || fail
 -# curl
 -$VG guestfish -x -a ftp://user@example.com/disk.img </dev/null >test-add-uri.out 2>&1
 -grep -sq 'add_drive "/disk.img" "protocol:ftp" "server:tcp:example.com" "username:user"' test-add-uri.out || fail
 -
 -# gluster
 -$VG guestfish -x -a gluster://example.com/disk </dev/null >test-add-uri.out 2>&1
 -grep -sq 'add_drive "disk" "protocol:gluster" "server:tcp:example.com"' test-add-uri.out || fail
 -
 # NBD
 $VG guestfish -x -a nbd://example.com </dev/null >test-add-uri.out 2>&1
 grep -sq 'add_drive "" "protocol:nbd" "server:tcp:example.com"' test-add-uri.out || fail
-@@ -63,22 +59,5 @@ grep -sq 'add_drive "pool/disk" "protocol:rbd" "server:tcp:example.com:6789"' te
+@@ -67,29 +59,5 @@ grep -sq 'add_drive "pool/disk" "protocol:rbd" "server:tcp:example.com:6789"' te
 $VG guestfish -x -a rbd:///pool/disk </dev/null >test-add-uri.out 2>&1
 grep -sq 'add_drive "pool/disk" "protocol:rbd"' test-add-uri.out || fail
 -# sheepdog
 -$VG guestfish -x -a sheepdog:///volume/image </dev/null >test-add-uri.out 2>&1
 -grep -sq 'add_drive "volume/image" "protocol:sheepdog"' test-add-uri.out || fail
 -
 -$VG guestfish -x -a sheepdog://example.com:3000/volume/image </dev/null >test-add-uri.out 2>&1
 -grep -sq 'add_drive "volume/image" "protocol:sheepdog" "server:tcp:example.com:3000"' test-add-uri.out || fail
 -
 -# ssh
 -$VG guestfish -x -a ssh://example.com/disk.img </dev/null >test-add-uri.out 2>&1
 -grep -sq 'add_drive "/disk.img" "protocol:ssh" "server:tcp:example.com"' test-add-uri.out || fail
@ -180,19 +220,26 @@ 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 37476c93e..9f0402510 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.
+@@ -297,29 +297,6 @@ F<filename> is interpreted as a local file or device.
 This is the default if the optional protocol parameter
 is omitted.
-=item C<protocol = \"ftp\"|\"ftps\"|\"http\"|\"https\">
+-=item C<protocol = \"ftp\"|\"ftps\"|\"http\"|\"https\"|\"tftp\">
 -
-Connect to a remote FTP or HTTP server.
+-Connect to a remote FTP, HTTP or TFTP server.
 -The C<server> parameter must also be supplied - see below.
 -
-See also: L<guestfs(3)/FTP AND HTTP>
+-See also: L<guestfs(3)/FTP, HTTP AND TFTP>
 -
 -=item C<protocol = \"gluster\">
 -
 -Connect to the GlusterFS server.
 -The C<server> parameter must also be supplied - see below.
 -
 -See also: L<guestfs(3)/GLUSTER>
 -
 -=item C<protocol = \"iscsi\">
 -
@ -206,10 +253,17 @@ index 20f6e8436..768f58433 100644
 =item C<protocol = \"nbd\">
 Connect to the Network Block Device server.
-@@ -382,15 +366,6 @@ The C<secret> parameter may be supplied.  See below.
+@@ -336,22 +313,6 @@ The C<secret> parameter may be supplied.  See below.
 See also: L<guestfs(3)/CEPH>.
 -=item C<protocol = \"sheepdog\">
 -
 -Connect to the Sheepdog server.
 -The C<server> parameter may also be supplied - see below.
 -
 -See also: L<guestfs(3)/SHEEPDOG>.
 -
 -=item C<protocol = \"ssh\">
 -
 -Connect to the Secure Shell (ssh) server.
@ -222,24 +276,26 @@ index 20f6e8436..768f58433 100644
 =back
 =item C<server>
-@@ -401,11 +376,8 @@ is a list of server(s).
+@@ -362,13 +323,8 @@ is a list of server(s).
  Protocol       Number of servers required
  --------       --------------------------
  file           List must be empty or param not used at all
- ftp|ftps|http|https  Exactly one
+- ftp|ftps|http|https|tftp  Exactly one
 - gluster        Exactly one
 - iscsi          Exactly one
  nbd            Exactly one
  rbd            Zero or more
 - sheepdog       Zero or more
 - ssh            Exactly one
 Each list element is a string specifying a server.  The string must be
 in one of the following formats:
-@@ -421,10 +393,10 @@ for the protocol is used (see F</etc/services>).
+@@ -384,10 +340,10 @@ for the protocol is used (see F</etc/services>).
 =item C<username>
-For the C<ftp>, C<ftps>, C<http>, C<https>, C<iscsi>, C<rbd> and C<ssh>
+-For the C<ftp>, C<ftps>, C<http>, C<https>, C<iscsi>, C<rbd>, C<ssh>
-protocols, this specifies the remote username.
+-and C<tftp> protocols, this specifies the remote username.
 +For the C<rbd>
 +protocol, this specifies the remote username.
@ -249,162 +305,85 @@ index 20f6e8436..768f58433 100644
 example if using the libvirt backend and if the libvirt backend is configured to
 start the qemu appliance as a special user such as C<qemu.qemu>.  If in doubt,
 diff --git a/lib/drives.c b/lib/drives.c
-index c068b8ecb..6e4453ce5 100644
+index 46af66db4..c81ded5d7 100644
 --- a/lib/drives.c
 +++ b/lib/drives.c
-@@ -166,34 +166,6 @@ create_drive_non_file (guestfs_h *g,
+@@ -168,6 +168,7 @@ create_drive_non_file (guestfs_h *g,
   return drv;
 }
-static struct drive *
+#if 0 /* DISABLED IN RHEL 8 */
-create_drive_curl (guestfs_h *g,
+ static struct drive *
-                   const struct drive_create_data *data)
+ create_drive_curl (guestfs_h *g,
-{
+                    const struct drive_create_data *data)
-  if (data->nr_servers != 1) {
+@@ -226,6 +227,7 @@ create_drive_gluster (guestfs_h *g,
-    error (g, _("curl: you must specify exactly one server"));
+ 
-    return NULL;
+   return create_drive_non_file (g, data);
-  }
+ }
-
+#endif /* DISABLED IN RHEL 8 */
-  if (data->servers[0].transport != drive_transport_none &&
+ 
 -      data->servers[0].transport != drive_transport_tcp) {
 -    error (g, _("curl: only tcp transport is supported"));
 -    return NULL;
 -  }
 -
 -  if (STREQ (data->exportname, "")) {
 -    error (g, _("curl: pathname should not be an empty string"));
 -    return NULL;
 -  }
 -
 -  if (data->exportname[0] != '/') {
 -    error (g, _("curl: pathname must begin with a '/'"));
 -    return NULL;
 -  }
 -
 -  return create_drive_non_file (g, data);
 -}
 -
 static int
 nbd_port (void)
- {
+@@ -294,6 +296,7 @@ create_drive_rbd (guestfs_h *g,
@@ -261,67 +233,6 @@ create_drive_rbd (guestfs_h *g,
   return create_drive_non_file (g, data);
 }
-static struct drive *
+#if 0 /* DISABLED IN RHEL 8 */
-create_drive_ssh (guestfs_h *g,
+ static struct drive *
-                  const struct drive_create_data *data)
+ create_drive_sheepdog (guestfs_h *g,
-{
+                        const struct drive_create_data *data)
-  if (data->nr_servers != 1) {
+@@ -394,6 +397,7 @@ create_drive_iscsi (guestfs_h *g,
-    error (g, _("ssh: you must specify exactly one server"));
+ 
-    return NULL;
+   return create_drive_non_file (g, data);
-  }
+ }
-
+#endif /* DISABLED IN RHEL 8 */
-  if (data->servers[0].transport != drive_transport_none &&
+ 
 -      data->servers[0].transport != drive_transport_tcp) {
 -    error (g, _("ssh: only tcp transport is supported"));
 -    return NULL;
 -  }
 -
 -  if (STREQ (data->exportname, "")) {
 -    error (g, _("ssh: pathname should not be an empty string"));
 -    return NULL;
 -  }
 -
 -  if (data->exportname[0] != '/') {
 -    error (g, _("ssh: pathname must begin with a '/'"));
 -    return NULL;
 -  }
 -
 -  if (data->username && STREQ (data->username, "")) {
 -    error (g, _("ssh: username should not be an empty string"));
 -    return NULL;
 -  }
 -
 -  return create_drive_non_file (g, data);
 -}
 -
 -static struct drive *
 -create_drive_iscsi (guestfs_h *g,
 -                    const struct drive_create_data *data)
 -{
 -  if (data->nr_servers != 1) {
 -    error (g, _("iscsi: you must specify exactly one server"));
 -    return NULL;
 -  }
 -
 -  if (data->servers[0].transport != drive_transport_none &&
 -      data->servers[0].transport != drive_transport_tcp) {
 -    error (g, _("iscsi: only tcp transport is supported"));
 -    return NULL;
 -  }
 -
 -  if (STREQ (data->exportname, "")) {
 -    error (g, _("iscsi: target name should not be an empty string"));
 -    return NULL;
 -  }
 -
 -  if (data->exportname[0] == '/') {
 -    error (g, _("iscsi: target string must not begin with a '/'"));
 -    return NULL;
 -  }
 -
 -  return create_drive_non_file (g, data);
 -}
 -
 /**
  * Create the special F</dev/null> drive.
-  *
+@@ -856,6 +860,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
@@ -768,26 +679,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
       drv = create_drive_file (g, &data);
     }
   }
-  else if (STREQ (protocol, "ftp")) {
+#if 0 /* DISABLED IN RHEL 8 */
-    data.protocol = drive_protocol_ftp;
+   else if (STREQ (protocol, "ftp")) {
-    drv = create_drive_curl (g, &data);
+     data.protocol = drive_protocol_ftp;
-  }
+     drv = create_drive_curl (g, &data);
-  else if (STREQ (protocol, "ftps")) {
+@@ -880,6 +885,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
-    data.protocol = drive_protocol_ftps;
+     data.protocol = drive_protocol_iscsi;
-    drv = create_drive_curl (g, &data);
+     drv = create_drive_iscsi (g, &data);
-  }
+   }
-  else if (STREQ (protocol, "http")) {
+#endif /* DISABLED IN RHEL 8 */
 -    data.protocol = drive_protocol_http;
 -    drv = create_drive_curl (g, &data);
 -  }
 -  else if (STREQ (protocol, "https")) {
 -    data.protocol = drive_protocol_https;
 -    drv = create_drive_curl (g, &data);
 -  }
 -  else if (STREQ (protocol, "iscsi")) {
 -    data.protocol = drive_protocol_iscsi;
 -    drv = create_drive_iscsi (g, &data);
 -  }
   else if (STREQ (protocol, "nbd")) {
     data.protocol = drive_protocol_nbd;
     drv = create_drive_nbd (g, &data);
-@@ -796,10 +687,6 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
+@@ -888,6 +894,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
     data.protocol = drive_protocol_rbd;
     drv = create_drive_rbd (g, &data);
   }
-  else if (STREQ (protocol, "ssh")) {
+#if 0 /* DISABLED IN RHEL 8 */
-    data.protocol = drive_protocol_ssh;
+   else if (STREQ (protocol, "sheepdog")) {
-    drv = create_drive_ssh (g, &data);
+     data.protocol = drive_protocol_sheepdog;
-  }
+     drv = create_drive_sheepdog (g, &data);
@@ -900,6 +907,7 @@ guestfs_impl_add_drive_opts (guestfs_h *g, const char *filename,
     data.protocol = drive_protocol_tftp;
     drv = create_drive_curl (g, &data);
   }
 +#endif /* DISABLED IN RHEL 8 */
   else {
     error (g, _("unknown protocol ‘%s’"), protocol);
     drv = NULL; /*FALLTHROUGH*/
 diff --git a/lib/guestfs.pod b/lib/guestfs.pod
-index ecab0e1f3..dff32cc9e 100644
+index bce9eb79f..2bb13b875 100644
 --- a/lib/guestfs.pod
 +++ b/lib/guestfs.pod
-@@ -723,51 +723,6 @@ a qcow2 backing file specification, libvirt does not construct an
+@@ -715,70 +715,6 @@ servers.  The server string is documented in
- ephemeral secret object from those, for Ceph authentication.  Refer to
+ L</guestfs_add_drive_opts>. The C<username> and C<secret> parameters are
- L<https://bugzilla.redhat.com/2033247>.
+ also optional, and if not given, then no authentication will be used.
-=head3 FTP AND HTTP
+-=head3 FTP, HTTP AND TFTP
 -
-Libguestfs can access remote disks over FTP, FTPS, HTTP or HTTPS
+-Libguestfs can access remote disks over FTP, FTPS, HTTP, HTTPS
-protocols.
+-or TFTP protocols.
 -
 -To do this, set the optional C<protocol> and C<server> parameters of
 -L</guestfs_add_drive_opts> like this:
@ -417,16 +396,35 @@ index ecab0e1f3..dff32cc9e 100644
 -                         -1);
 -
 -The C<protocol> can be one of C<"ftp">, C<"ftps">, C<"http">,
-or C<"https">.
+-C<"https"> or C<"tftp">.
 -
 -C<servers> (the C<server> parameter) is a list which must have a
-single element.  The single element is a string defining the web
+-single element.  The single element is a string defining the web,
-or FTP server.  The format of this string is documented in
+-FTP or TFTP server.  The format of this string is documented in
 -L</guestfs_add_drive_opts>.
 -
 -=head3 GLUSTER
 -
-Glusterfs support was removed in libguestfs 1.54 (2024).
+-Libguestfs can access Gluster disks.
 -
 -To do this, set the optional C<protocol> and C<server> parameters of
 -L</guestfs_add_drive_opts> like this:
 -
 - char **servers = { "gluster.example.org:24007", NULL };
 - guestfs_add_drive_opts (g, "volname/image",
 -                         GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
 -                         GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "gluster",
 -                         GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
 -                         -1);
 -
 -C<servers> (the C<server> parameter) is a list which must have a
 -single element.  The single element is a string defining the Gluster
 -server.  The format of this string is documented in
 -L</guestfs_add_drive_opts>.
 -
 -Note that gluster usually requires the client process (ie. libguestfs)
 -to run as B<root> and will give unfathomable errors if it is not
 -(eg. "No data available").
 -
 -=head3 ISCSI
 -
@ -449,13 +447,27 @@ index ecab0e1f3..dff32cc9e 100644
 =head3 NETWORK BLOCK DEVICE
 Libguestfs can access Network Block Device (NBD) disks remotely.
-@@ -830,28 +785,6 @@ L<https://bugs.launchpad.net/qemu/+bug/1155677>
+@@ -841,42 +777,6 @@ L<https://bugs.launchpad.net/qemu/+bug/1155677>
 =back
 -=head3 SHEEPDOG
 -
-Sheepdog support was removed in libguestfs 1.54 (2024).
+-Libguestfs can access Sheepdog disks.
 -
 -To do this, set the optional C<protocol> and C<server> parameters of
 -L</guestfs_add_drive_opts> like this:
 -
 - char **servers = { /* optional servers ... */ NULL };
 - guestfs_add_drive_opts (g, "volume",
 -                         GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
 -                         GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "sheepdog",
 -                         GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,
 -                         -1);
 -
 -The optional list of C<servers> may be zero or more server addresses
 -(C<"hostname:port">).  The format of the server strings is documented
 -in L</guestfs_add_drive_opts>.
 -
 -=head3 SSH
 -
@ -479,13 +491,20 @@ 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 3c5aa592e..f73827bd6 100755
 --- a/tests/disks/test-qemu-drive-libvirt.sh
 +++ b/tests/disks/test-qemu-drive-libvirt.sh
-@@ -65,13 +65,6 @@ check_output
+@@ -64,34 +64,6 @@ check_output
 grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail ceph2
 rm "$DEBUG_QEMU_FILE"
 -# Gluster.
 -
 -$guestfish -d gluster run ||:
 -check_output
 -grep -sq -- '-drive file=gluster://1.2.3.4:1234/volname/image,' "$DEBUG_QEMU_FILE" || fail gluster
 -rm "$DEBUG_QEMU_FILE"
 -
 -# iSCSI.
 -
 -$guestfish -d iscsi run ||:
@ -493,14 +512,28 @@ index afbeddec6..93df4be0a 100755
 -grep -sq -- '-drive file=iscsi://1.2.3.4:1234/iqn.2003-01.org.linux-iscsi.fedora' "$DEBUG_QEMU_FILE" || fail iscsi
 -rm "$DEBUG_QEMU_FILE"
 -
- # NBD.
+-# NBD.
 -
 -$guestfish -d nbd run ||:
 -check_output
 -grep -sq -- '-drive file=nbd:1.2.3.4:1234,' "$DEBUG_QEMU_FILE" || fail nbd
 -rm "$DEBUG_QEMU_FILE"
 -
 -# Sheepdog.
 -
 -$guestfish -d sheepdog run ||:
 -check_output
 -grep -sq -- '-drive file=sheepdog:volume,' "$DEBUG_QEMU_FILE" || fail sheepdog
 -rm "$DEBUG_QEMU_FILE"
 -
 # Local, stored in a pool.
- $guestfish -d nbd run ||:
+ $guestfish -d pool1 run ||:
 diff --git a/tests/disks/test-qemu-drive.sh b/tests/disks/test-qemu-drive.sh
-index 9ee7df389..b3e4f9903 100755
+index 19dd60a2f..583e031bd 100755
 --- a/tests/disks/test-qemu-drive.sh
 +++ b/tests/disks/test-qemu-drive.sh
-@@ -62,35 +62,6 @@ check_output
+@@ -62,45 +62,6 @@ check_output
 grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail
 rm "$DEBUG_QEMU_FILE"
@ -514,6 +547,16 @@ index 9ee7df389..b3e4f9903 100755
 -grep -sq -- '-drive file=http://www.example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
 -
 -# Gluster.
 -
 -guestfish <<EOF ||:
 -  add "volname/image" "format:raw" "protocol:gluster" "server:www.example.com:24007"
 -  run
 -EOF
 -check_output
 -grep -sq -- '-drive file=gluster://www.example.com:24007/volname/image,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
 -
 -# iSCSI.
 -
 -guestfish <<EOF ||:
@ -536,11 +579,21 @@ index 9ee7df389..b3e4f9903 100755
 # NBD.
 guestfish <<EOF ||:
-@@ -108,14 +79,3 @@ EOF
+@@ -118,24 +79,3 @@ EOF
 check_output
 grep -sq -- '-drive file=nbd:unix:/socket,' "$DEBUG_QEMU_FILE" || fail
 rm "$DEBUG_QEMU_FILE"
 -
 -# Sheepdog.
 -
 -guestfish <<EOF ||:
 -  add "volume" "format:raw" "protocol:sheepdog"
 -  run
 -EOF
 -check_output
 -grep -sq -- '-drive file=sheepdog:volume,' "$DEBUG_QEMU_FILE" || fail
 -rm "$DEBUG_QEMU_FILE"
 -
 -# SSH.
 -
 -guestfish <<EOF ||:
@ -552,5 +605,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.31.1
--- a/SOURCES/0004-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
+++ b/SOURCES/0004-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
@ -0,0 +1,72 @@
 From 34f8c6a5eb0eabfba4ab1831b45e2baa73a4b501 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 19 Sep 2014 13:38:20 +0100
 Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197).
 This isn't supported in RHEL 8.
 ---
 lib/launch-uml.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 diff --git a/lib/launch-uml.c b/lib/launch-uml.c
 index 5aec50a57..8b9fcd770 100644
 --- a/lib/launch-uml.c
 +++ b/lib/launch-uml.c
@@ -44,7 +44,9 @@ struct backend_uml_data {
   char umid[UML_UMID_LEN+1];    /* umid=<...> unique ID. */
 };
 +#if 0
 static void print_vmlinux_command_line (guestfs_h *g, char **argv);
 +#endif
 /* Run uml_mkcow to create a COW overlay. */
 static char *
@@ -81,6 +83,7 @@ create_cow_overlay_uml (guestfs_h *g, void *datav, struct drive *drv)
   return make_cow_overlay (g, drv->src.u.path);
 }
 +#if 0
 /* Test for features which are not supported by the UML backend.
  * Possibly some of these should just be warnings, not errors.
  */
@@ -133,10 +136,17 @@ uml_supported (guestfs_h *g)
   return true;
 }
 +#endif
 static int
 launch_uml (guestfs_h *g, void *datav, const char *arg)
 {
 +  error (g,
 +	 "launch: In RHEL, only the 'libvirt' or 'direct' method is supported.\n"
 +	 "In particular, User-Mode Linux (UML) is not supported.");
 +  return -1;
 +
 +#if 0
   struct backend_uml_data *data = datav;
   CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (cmdline);
   int console_sock = -1, daemon_sock = -1;
@@ -496,8 +506,10 @@ launch_uml (guestfs_h *g, void *datav, const char *arg)
   }
   g->state = CONFIG;
   return -1;
 +#endif
 }
 +#if 0
 /* This is called from the forked subprocess just before vmlinux runs,
  * so it can just print the message straight to stderr, where it will
  * be picked up and funnelled through the usual appliance event API.
@@ -527,6 +539,7 @@ print_vmlinux_command_line (guestfs_h *g, char **argv)
   fputc ('\n', stderr);
 }
 +#endif
 static int
 shutdown_uml (guestfs_h *g, void *datav, int check_for_errors)
 -- 
 2.31.1
--- a/SOURCES/0005-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
+++ b/SOURCES/0005-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
@ -1,8 +1,8 @@
-From b8c15791942f56030b49c5e725e61bbba4a990d2 Mon Sep 17 00:00:00 2001
+From cb2ac63562447e2780bd7103ed060fd6013b9054 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
+Subject: [PATCH] RHEL 8: Reject use of libguestfs-winsupport features except
- virt-* tools (RHBZ#1240276).
+ for virt-* tools (RHBZ#1240276).
 Fix the tests: it doesn't let us use guestfish for arbitrary Windows
 edits.
@ -13,14 +13,14 @@ edits.
 3 files changed, 19 insertions(+)
 diff --git a/generator/c.ml b/generator/c.ml
-index 838e7f426..09181028b 100644
+index 86d3b26f8..a625361a9 100644
 --- a/generator/c.ml
 +++ b/generator/c.ml
-@@ -1836,6 +1836,22 @@ and generate_client_actions actions () =
+@@ -1846,6 +1846,22 @@ and generate_client_actions actions () =
     check_args_validity c_name style;
     trace_call name c_name style;
-+    (* RHEL *)
+    (* RHEL 8 *)
 +    if name = "mount" || name = "mount_ro" || name = "mount_options" ||
 +       name = "mount_vfs" then (
 +      pr "  if (g->program && !STRPREFIX (g->program, \"virt-\")) {\n";
@ -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 30908a918..73cf5144e 100755
 --- a/test-data/phony-guests/make-windows-img.sh
 +++ b/test-data/phony-guests/make-windows-img.sh
@@ -37,6 +37,7 @@ fi
@ -52,10 +52,10 @@ index 16debd129..1c13ddac3 100755
 run
 diff --git a/tests/charsets/test-charset-fidelity.c b/tests/charsets/test-charset-fidelity.c
-index 105291dc3..5ca4f3b6d 100644
+index 39ccc2068..2b2e2d8a9 100644
 --- a/tests/charsets/test-charset-fidelity.c
 +++ b/tests/charsets/test-charset-fidelity.c
-@@ -96,6 +96,8 @@ main (int argc, char *argv[])
+@@ -94,6 +94,8 @@ main (int argc, char *argv[])
   if (g == NULL)
     error (EXIT_FAILURE, 0, "failed to create handle");
@ -65,5 +65,5 @@ index 105291dc3..5ca4f3b6d 100644
     exit (EXIT_FAILURE);
 -- 
-2.43.0
+2.31.1
--- a/SOURCES/0006-build-Avoid-warnings-about-unknown-pragmas.patch
+++ b/SOURCES/0006-build-Avoid-warnings-about-unknown-pragmas.patch
@ -0,0 +1,37 @@
 From dbd1eaab6a478cf0c3ea093a56b3d04c29278615 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 12 Jan 2021 10:23:11 +0000
 Subject: [PATCH] build: Avoid warnings about unknown pragmas.
 In commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe we started to
 ignore bogus GCC 11 warnings.  Unfortunately earlier versions of GCC
 don't know about those pragmas so give warnings [hence errors in
 developer builds] like:
 tsk.c:75:32: error: unknown option after '#pragma GCC diagnostic' kind [-Werror=pragmas]
 Turn off these warnings.
 Updates: commit 4bbbf03b8bc266ed2b63c461cd0945250bb134fe
 (cherry picked from commit 812f837c97f48ce0c26a0e02286fb9180c282923)
 ---
 m4/guestfs-c.m4 | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/m4/guestfs-c.m4 b/m4/guestfs-c.m4
 index 25ffea0d9..bbb4db464 100644
 --- a/m4/guestfs-c.m4
 +++ b/m4/guestfs-c.m4
@@ -108,6 +108,9 @@ gl_WARN_ADD([-Wformat-truncation=1])
 dnl GCC 9 at level 2 gives apparently bogus errors when %.*s is used.
 gl_WARN_ADD([-Wformat-overflow=1])
 +dnl GCC < 11 gives warnings when disabling GCC 11 warnings.
 +gl_WARN_ADD([-Wno-pragmas])
 +
 AC_SUBST([WARN_CFLAGS])
 NO_SNV_CFLAGS=
 -- 
 2.31.1
--- a/SOURCES/0007-daemon-lvm-Use-lvcreate-yes-to-avoid-interactive-pro.patch
+++ b/SOURCES/0007-daemon-lvm-Use-lvcreate-yes-to-avoid-interactive-pro.patch
@ -0,0 +1,94 @@
 From 22416a2329ec531b9608c21b11ff3d53275fe7a0 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 22 Feb 2021 10:18:45 +0000
 Subject: [PATCH] daemon: lvm: Use lvcreate --yes to avoid interactive prompts.
 See https://bugzilla.redhat.com/show_bug.cgi?id=1930996#c1
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1930996
 (cherry picked from commit 21cd97732c4973db835b8b6540c8ad582ebd2bda)
 ---
 daemon/lvm.c                     |  2 +-
 tests/regressions/Makefile.am    |  2 ++
 tests/regressions/rhbz1930996.sh | 36 ++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100755 tests/regressions/rhbz1930996.sh
 diff --git a/daemon/lvm.c b/daemon/lvm.c
 index 841dc4b6b..72c59c3a1 100644
 --- a/daemon/lvm.c
 +++ b/daemon/lvm.c
@@ -219,7 +219,7 @@ do_lvcreate (const char *logvol, const char *volgroup, int mbytes)
   snprintf (size, sizeof size, "%d", mbytes);
   r = command (NULL, &err,
 -               "lvm", "lvcreate",
 +               "lvm", "lvcreate", "--yes",
                "-L", size, "-n", logvol, volgroup, NULL);
   if (r == -1) {
     reply_with_error ("%s", err);
 diff --git a/tests/regressions/Makefile.am b/tests/regressions/Makefile.am
 index ecb0d68a7..c1e0ee8a9 100644
 --- a/tests/regressions/Makefile.am
 +++ b/tests/regressions/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST = \
 	rhbz1370424.sh \
 	rhbz1370424.xml \
 	rhbz1477623.sh \
 +	rhbz1930996.sh \
 	test-noexec-stack.pl
 TESTS = \
@@ -79,6 +80,7 @@ TESTS = \
 	rhbz1285847.sh \
 	rhbz1370424.sh \
 	rhbz1477623.sh \
 +	rhbz1930996.sh \
 	test-big-heap \
 	test-noexec-stack.pl \
 	$(SLOW_TESTS)
 diff --git a/tests/regressions/rhbz1930996.sh b/tests/regressions/rhbz1930996.sh
 new file mode 100755
 index 000000000..27089beaa
 --- /dev/null
 +++ b/tests/regressions/rhbz1930996.sh
@@ -0,0 +1,36 @@
 +#!/bin/bash -
 +# libguestfs
 +# Copyright (C) 2017-2021 Red Hat Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 +
 +# Regression test for:
 +# https://bugzilla.redhat.com/show_bug.cgi?id=1930996#c1
 +#
 +# Actually a bug/change in LVM, previously we failed to create an LV
 +# if the underlying disk contained a filesystem signature.
 +
 +set -e
 +
 +$TEST_FUNCTIONS
 +skip_if_skipped
 +skip_unless_phony_guest fedora.img
 +
 +f=rhbz1930996.img
 +rm -f $f
 +
 +guestfish -N $f=lvfs vgremove VG : vgcreate VG /dev/sda1 : lvcreate LV2 VG 100
 +
 +rm $f
 -- 
 2.31.1
--- a/SOURCES/0008-inspection-More-reliable-detection-of-Linux-split-us.patch
+++ b/SOURCES/0008-inspection-More-reliable-detection-of-Linux-split-us.patch
@ -0,0 +1,113 @@
 From e1b339688e5f8f2a14fe0c7e9d02ad68004e4655 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 15 Apr 2021 09:18:22 +0100
 Subject: [PATCH] inspection: More reliable detection of Linux split /usr
 configurations
 In RHEL 8+, /usr/etc no longer exists.  Since we were looking for this
 directory in order to detect a separate /usr partition, those were no
 longer detected, so the merging of /usr data into the root was not
 being done.  The result was incomplete inspection data and failure of
 virt-v2v.
 All Linux systems since forever have had /usr/src but not /src, so
 detect this instead.
 Furthermore the merging code didn't work, because we expected that the
 root filesystem had a distro assigned, but in this configuration we
 may need to look for that information in /usr/lib/os-release (not on
 the root filesystem).  This change makes the merging work even if we
 have incomplete information about the root filesystem, so long as we
 have an /etc/fstab entry pointing to the /usr mountpoint.
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1949683
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1930133
 Fixes: commit 394d11be49121884295e61964ed47f5a8488c252
 (cherry picked from commit 26427b9ecc64e7e5e53a1d577cef9dc080d08877)
 ---
 daemon/inspect.ml    | 33 +++++++++++++++------------------
 daemon/inspect_fs.ml |  6 +++---
 2 files changed, 18 insertions(+), 21 deletions(-)
 diff --git a/daemon/inspect.ml b/daemon/inspect.ml
 index 945a476f6..fb75b4a6c 100644
 --- a/daemon/inspect.ml
 +++ b/daemon/inspect.ml
@@ -182,11 +182,9 @@ and check_for_duplicated_bsd_root fses =
 and collect_linux_inspection_info fses =
   List.map (
     function
 -    | { role = RoleRoot { distro = Some d } } as root ->
 -       if d <> DISTRO_COREOS then
 -         collect_linux_inspection_info_for fses root
 -       else
 -         root
 +    | { role = RoleRoot { distro = Some DISTRO_COREOS } } as root -> root
 +    | { role = RoleRoot _ } as root ->
 +       collect_linux_inspection_info_for fses root
     | fs -> fs
   ) fses
@@ -196,29 +194,28 @@ and collect_linux_inspection_info fses =
  * or other ways to identify the OS).
  *)
 and collect_linux_inspection_info_for fses root =
 -  let root_distro, root_fstab =
 +  let root_fstab =
     match root with
 -    | { role = RoleRoot { distro = Some d; fstab = f } } -> d, f
 +    | { role = RoleRoot { fstab = f } } -> f
     | _ -> assert false in
   try
     let usr =
       List.find (
         function
 -        | { role = RoleUsr { distro = d } }
 -             when d = Some root_distro || d = None -> true
 +        | { role = RoleUsr _; fs_location = usr_mp } ->
 +           (* This checks that this usr is found in the fstab of
 +            * the root filesystem.
 +            *)
 +           List.exists (
 +             fun (mountable, _) ->
 +               usr_mp.mountable = mountable
 +           ) root_fstab
         | _ -> false
       ) fses in
 -    let usr_mountable = usr.fs_location.mountable in
 -
 -    (* This checks that [usr] is found in the fstab of the root
 -     * filesystem.  If not, [Not_found] is thrown.
 -     *)
 -    ignore (
 -      List.find (fun (mountable, _) -> usr_mountable = mountable) root_fstab
 -    );
 -
 +    eprintf "collect_linux_inspection_info_for: merging:\n%sinto:\n%s"
 +      (string_of_fs usr) (string_of_fs root);
     merge usr root;
     root
   with
 diff --git a/daemon/inspect_fs.ml b/daemon/inspect_fs.ml
 index 6e00c7083..02b5a0470 100644
 --- a/daemon/inspect_fs.ml
 +++ b/daemon/inspect_fs.ml
@@ -164,10 +164,10 @@ and check_filesystem mountable =
     ()
   )
   (* Linux /usr? *)
 -  else if Is.is_dir "/etc" &&
 -          Is.is_dir "/bin" &&
 -          Is.is_dir "/share" &&
 +  else if Is.is_dir "/bin" &&
           Is.is_dir "/local" &&
 +          Is.is_dir "/share" &&
 +          Is.is_dir "/src" &&
           not (Is.is_file "/etc/fstab") then (
     debug_matching "Linux /usr";
     role := `Usr;
 -- 
 2.31.1
--- a/SOURCES/0009-lib-Autodetect-backing-format-for-qemu-img-create-b.patch
+++ b/SOURCES/0009-lib-Autodetect-backing-format-for-qemu-img-create-b.patch
@ -0,0 +1,49 @@
 From 791a16b049ea1ce2c450acd367fce774d9aab5b1 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 31 Aug 2021 08:27:15 +0100
 Subject: [PATCH] lib: Autodetect backing format for qemu-img create -b
 qemu 6.1 has decided to change qemu-img create so that a backing
 format (-F) is required if a backing file (-b) is specified.  Since we
 don't want to change the libguestfs API to force callers to specify
 this because that would be an API break, autodetect it.
 This is similar to commit c8c181e8d9 ("launch: libvirt: Autodetect
 backing format for readonly drive overlays").
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1998820
 (cherry picked from commit 45de287447bb18d59749fbfc1ec5072413090109)
 ---
 lib/create.c | 9 +++++++++
 1 file changed, 9 insertions(+)
 diff --git a/lib/create.c b/lib/create.c
 index 44a7df25f..75a4d3a28 100644
 --- a/lib/create.c
 +++ b/lib/create.c
@@ -255,6 +255,7 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
                    const struct guestfs_disk_create_argv *optargs)
 {
   const char *backingformat = NULL;
 +  CLEANUP_FREE char *backingformat_free = NULL;
   const char *preallocation = NULL;
   const char *compat = NULL;
   int clustersize = -1;
@@ -270,6 +271,14 @@ disk_create_qcow2 (guestfs_h *g, const char *filename, int64_t size,
       return -1;
     }
   }
 +  else if (backingfile) {
 +    /* Since qemu 6.1, qemu-img create has requires a backing format (-F)
 +     * parameter if backing file (-b) is used (RHBZ#1998820).
 +     */
 +    backingformat = backingformat_free = guestfs_disk_format (g, backingfile);
 +    if (!backingformat)
 +      return -1;
 +  }
   if (optargs->bitmask & GUESTFS_DISK_CREATE_PREALLOCATION_BITMASK) {
     if (STREQ (optargs->preallocation, "off") ||
         STREQ (optargs->preallocation, "sparse"))
 -- 
 2.31.1
--- a/SOURCES/0010-daemon-chroot-Fix-long-standing-possible-deadlock.patch
+++ b/SOURCES/0010-daemon-chroot-Fix-long-standing-possible-deadlock.patch
@ -0,0 +1,44 @@
 From 3435938f43ca3737ec1d73da4d8cad756b5c9508 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 26 Mar 2021 16:04:43 +0000
 Subject: [PATCH] daemon: chroot: Fix long-standing possible deadlock.
 The child (chrooted) process wrote its answer on the pipe and then
 exited.  Meanwhile the parent waiting for the child to exit before
 reading from the pipe.  Thus if the output was larger than a Linux
 pipebuffer then the whole thing would deadlock.
 (cherry picked from commit 94e64b28bee3b8dc7ed354a366d6a8f7ba5f245c)
 ---
 daemon/chroot.ml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 diff --git a/daemon/chroot.ml b/daemon/chroot.ml
 index 5e856c91f..7da8ae29e 100644
 --- a/daemon/chroot.ml
 +++ b/daemon/chroot.ml
@@ -62,6 +62,10 @@ let f t func arg =
   (* Parent. *)
   close wfd;
 +  let chan = in_channel_of_descr rfd in
 +  let ret = input_value chan in
 +  close_in chan;
 +
   let _, status = waitpid [] pid in
   (match status with
    | WEXITED 0 -> ()
@@ -76,10 +80,6 @@ let f t func arg =
       failwithf "chroot ‘%s’ stopped by signal %d" t.name i
   );
 -  let chan = in_channel_of_descr rfd in
 -  let ret = input_value chan in
 -  close_in chan;
 -
   match ret with
   | Either ret -> ret
   | Or exn -> raise exn
 -- 
 2.31.1
--- a/SOURCES/0011-inspection-Fix-inspection-of-recent-RPM-guests-using.patch
+++ b/SOURCES/0011-inspection-Fix-inspection-of-recent-RPM-guests-using.patch
--- a/SOURCES/0012-inspection-Return-RPM-epoch.patch
+++ b/SOURCES/0012-inspection-Return-RPM-epoch.patch
@ -0,0 +1,36 @@
 From 3ce392c9870a589cc50d2270fcf07b4d129c3dc3 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 27 Mar 2021 09:31:00 +0000
 Subject: [PATCH] inspection: Return RPM epoch.
 Fixes: commit c9ee831affed55abe0f928134cbbd2ed83b2f510
 (cherry picked from commit fef73bce7eec0ce0753a2e150e4e088020d38643)
 ---
 daemon/rpm-c.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
 diff --git a/daemon/rpm-c.c b/daemon/rpm-c.c
 index 92a3abf58..be0e81e22 100644
 --- a/daemon/rpm-c.c
 +++ b/daemon/rpm-c.c
@@ -108,13 +108,16 @@ guestfs_int_daemon_rpm_next_application (value unitv)
   h = headerLink (h);
   app.app2_name = headerFormat (h, "%{NAME}", NULL);
 -  // XXXapp.app2_epoch = headerFormat (h, "%{NAME}", NULL);
   app.app2_version = headerFormat (h, "%{VERSION}", NULL);
   app.app2_release = headerFormat (h, "%{RELEASE}", NULL);
   app.app2_arch = headerFormat (h, "%{ARCH}", NULL);
   app.app2_url = headerFormat (h, "%{URL}", NULL);
   app.app2_summary = headerFormat (h, "%{SUMMARY}", NULL);
   app.app2_description = headerFormat (h, "%{DESCRIPTION}", NULL);
 +
 +  /* epoch is special as the only int field. */
 +  app.app2_epoch = headerGetNumber (h, RPMTAG_EPOCH);
 +
   headerFree (h);
   /* Convert this to an OCaml struct.  Any NULL fields must be turned
 -- 
 2.31.1
--- a/SOURCES/0013-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch
+++ b/SOURCES/0013-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch
--- a/SOURCES/0014-po-POTFILES-Fix-list-of-files-for-translation.patch
+++ b/SOURCES/0014-po-POTFILES-Fix-list-of-files-for-translation.patch
@ -0,0 +1,34 @@
 From 9664527c107d04aab416be87cc4fcd76dcbe5927 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Mar 2021 18:25:13 +0100
 Subject: [PATCH] po/POTFILES: Fix list of files for translation.
 Fixes: commit c9ee831affed55abe0f928134cbbd2ed83b2f510
 (cherry picked from commit df983200d76bac37c811fbd2fb67e7ebe830e759)
 ---
 po/POTFILES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/po/POTFILES b/po/POTFILES
 index 0782e8ceb..fdc6e8062 100644
 --- a/po/POTFILES
 +++ b/po/POTFILES
@@ -128,6 +128,7 @@ daemon/pingdaemon.c
 daemon/proto.c
 daemon/readdir.c
 daemon/rename.c
 +daemon/rpm-c.c
 daemon/rsync.c
 daemon/scrub.c
 daemon/selinux-relabel.c
@@ -353,7 +354,6 @@ lib/command.c
 lib/conn-socket.c
 lib/copy-in-out.c
 lib/create.c
 -lib/dbdump.c
 lib/drives.c
 lib/errors.c
 lib/event-string.c
 -- 
 2.31.1
--- a/SOURCES/0015-m4-guestfs-find-db-tool.m4-Remove-unused-file.patch
+++ b/SOURCES/0015-m4-guestfs-find-db-tool.m4-Remove-unused-file.patch
@ -0,0 +1,64 @@
 From 083856d9f9c8fccc629bf0f3a5237d26434c8940 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Mar 2021 18:35:48 +0100
 Subject: [PATCH] m4/guestfs-find-db-tool.m4: Remove unused file.
 Fixes: commit 42e5e7cfdbca01b2e9bd50c63a9fc65b6da9192f
 (cherry picked from commit 8317279c3539562ebad9de13c7ac515dded74e4d)
 ---
 m4/guestfs-find-db-tool.m4 | 43 --------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 m4/guestfs-find-db-tool.m4
 diff --git a/m4/guestfs-find-db-tool.m4 b/m4/guestfs-find-db-tool.m4
 deleted file mode 100644
 index b404148c6..000000000
 --- a/m4/guestfs-find-db-tool.m4
 +++ /dev/null
@@ -1,43 +0,0 @@
 -# libguestfs
 -# Copyright (C) 2014 Red Hat Inc.
 -#
 -# This program is free software; you can redistribute it and/or modify
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation; either version 2 of the License, or
 -# (at your option) any later version.
 -#
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
 -#
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -
 -AC_DEFUN([GUESTFS_FIND_DB_TOOL],[
 -    pushdef([VARIABLE],$1)
 -    TOOL=$2
 -
 -    db_tool_name="db_$TOOL"
 -    db_versions="53 5.3 5.2 5.1 4.8 4.7 4.6"
 -    db_tool_patterns="dbX_$TOOL dbX.Y_$TOOL"
 -    db_tool_patterns="dbX_$TOOL db_$TOOL-X dbX.Y_$TOOL db_$TOOL-X.Y"
 -
 -    AC_ARG_VAR(VARIABLE, [Absolute path to $db_tool_name executable])
 -
 -    AS_IF(test -z "$VARIABLE", [
 -        exe_list="db_$TOOL"
 -        for ver in $db_versions ; do
 -            ver_maj=`echo $ver | cut -d. -f1`
 -            ver_min=`echo $ver | cut -d. -f2`
 -            for pattern in $db_tool_patterns ; do
 -                exe=`echo "$pattern" | sed -e "s/X/$ver_maj/g;s/Y/$ver_min/g"`
 -                exe_list="$exe_list $exe"
 -            done
 -        done
 -        AC_PATH_PROGS([]VARIABLE[], [$exe_list], [no])
 -    ])
 -
 -    popdef([VARIABLE])
 -])
 -- 
 2.31.1
--- a/SOURCES/0016-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch
+++ b/SOURCES/0016-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch
@ -0,0 +1,474 @@
 From f8ccce2c7a0c1323e0721f503322df525dd5b139 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 29 Mar 2021 12:22:12 +0100
 Subject: [PATCH] test-data/phony-guests: Fix phony RPM database, fix
 virt-inspector test.
 libguestfs 1.45.3 now reads the RPM database using librpm, which means
 our old phony database created by db_dump can no longer work.  Instead
 provide a real (but very minimal) sqlite database.
 This commit also fixes the virt-inspector test since the RPM database
 contents are now different.
 (cherry picked from commit 46bf6fb473889ed28bd7220476120edcda47ae07)
 ---
 inspector/expected-fedora-luks.img.xml | 208 +++++++++++++++++++++++--
 inspector/expected-fedora.img.xml      | 208 +++++++++++++++++++++++--
 2 files changed, 398 insertions(+), 18 deletions(-)
 diff --git a/inspector/expected-fedora-luks.img.xml b/inspector/expected-fedora-luks.img.xml
 index df6060a73..72cddaf88 100644
 --- a/inspector/expected-fedora-luks.img.xml
 +++ b/inspector/expected-fedora-luks.img.xml
@@ -30,22 +30,212 @@
     </filesystems>
     <applications>
       <application>
 -        <name>test1</name>
 -        <version>1.0</version>
 -        <release>1.fc14</release>
 +        <name>basesystem</name>
 +        <version>11</version>
 +        <release>10.fc33</release>
 +        <arch>noarch</arch>
 +        <url>(none)</url>
 +        <summary>The skeleton package which defines a simple Fedora system</summary>
 +        <description>Basesystem defines the components of a basic Fedora system
 +(for example, the package installation order to use during bootstrapping).
 +Basesystem should be in every installation of a system, and it
 +should never be removed.</description>
 +      </application>
 +      <application>
 +        <name>bash</name>
 +        <version>5.0.17</version>
 +        <release>2.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>https://www.gnu.org/software/bash</url>
 +        <summary>The GNU Bourne Again shell</summary>
 +        <description>The GNU Bourne Again shell (Bash) is a shell or command language
 +interpreter that is compatible with the Bourne shell (sh). Bash
 +incorporates useful features from the Korn shell (ksh) and the C shell
 +(csh). Most sh scripts can be run by bash without modification.</description>
 +      </application>
 +      <application>
 +        <name>fedora-gpg-keys</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora RPM keys</summary>
 +        <description>This package provides the RPM signature keys.</description>
 +      </application>
 +      <application>
 +        <name>fedora-release</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora release files</summary>
 +        <description>Fedora release files such as various /etc/ files that define the release
 +and systemd preset files that determine which services are enabled by default.</description>
 +      </application>
 +      <application>
 +        <name>fedora-release-common</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora release files</summary>
 +        <description>Release files common to all Editions and Spins of Fedora</description>
 +      </application>
 +      <application>
 +        <name>fedora-release-identity-basic</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Package providing the basic Fedora identity</summary>
 +        <description>Provides the necessary files for a Fedora installation that is not identifying
 +itself as a particular Edition or Spin.</description>
 +      </application>
 +      <application>
 +        <name>fedora-repos</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora package repositories</summary>
 +        <description>Fedora package repository files for yum and dnf along with gpg public keys.</description>
 +      </application>
 +      <application>
 +        <name>filesystem</name>
 +        <version>3.14</version>
 +        <release>3.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>https://pagure.io/filesystem</url>
 +        <summary>The basic directory layout for a Linux system</summary>
 +        <description>The filesystem package is one of the basic packages that is installed
 +on a Linux system. Filesystem contains the basic directory layout
 +for a Linux operating system, including the correct permissions for
 +the directories.</description>
 +      </application>
 +      <application>
 +        <name>glibc</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>The GNU libc libraries</summary>
 +        <description>The glibc package contains standard libraries which are used by
 +multiple programs on the system. In order to save disk space and
 +memory, as well as to make upgrading easier, common system code is
 +kept in one place and shared between programs. This particular package
 +contains the most important sets of shared libraries: the standard C
 +library and the standard math library. Without these two libraries, a
 +Linux system will not function.</description>
 +      </application>
 +      <application>
 +        <name>glibc-all-langpacks</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>All language packs for glibc.</summary>
 +      </application>
 +      <application>
 +        <name>glibc-common</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
         <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>Common binaries and locale data for glibc</summary>
 +        <description>The glibc-common package includes common binaries for the GNU libc
 +libraries, as well as national language (locale) support.</description>
       </application>
       <application>
 -        <name>test2</name>
 -        <version>2.0</version>
 -        <release>2.fc14</release>
 +        <name>gpg-pubkey</name>
 +        <version>9570ff31</version>
 +        <release>5e3006fb</release>
 +        <arch>(none)</arch>
 +        <url>(none)</url>
 +        <summary>Fedora (33) &lt;fedora-33-primary@fedoraproject.org&gt; public key</summary>
 +        <description>-----BEGIN PGP PUBLIC KEY BLOCK-----
 +Version: rpm-4.16.1.2 (NSS-3)
 +
 +mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
 +bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
 +kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
 +Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
 +QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
 +2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
 +UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
 +oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
 +rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
 +6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
 +EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
 +tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
 +cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
 +CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
 +P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
 +7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
 +AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
 +2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
 +GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
 +EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
 +fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
 +66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
 +Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
 +Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
 +=EPL3
 +-----END PGP PUBLIC KEY BLOCK-----
 +</description>
 +      </application>
 +      <application>
 +        <name>libgcc</name>
 +        <version>10.2.1</version>
 +        <release>9.fc33</release>
         <arch>x86_64</arch>
 +        <url>http://gcc.gnu.org</url>
 +        <summary>GCC version 10 shared support library</summary>
 +        <description>This package contains GCC shared support library which is needed
 +e.g. for exception handling support.</description>
 +      </application>
 +      <application>
 +        <name>ncurses-base</name>
 +        <version>6.2</version>
 +        <release>3.20200222.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://invisible-island.net/ncurses/ncurses.html</url>
 +        <summary>Descriptions of common terminals</summary>
 +        <description>This package contains descriptions of common terminals. Other terminal
 +descriptions are included in the ncurses-term package.</description>
       </application>
       <application>
 -        <name>test3</name>
 -        <version>3.0</version>
 -        <release>3.fc14</release>
 +        <name>ncurses-libs</name>
 +        <version>6.2</version>
 +        <release>3.20200222.fc33</release>
         <arch>x86_64</arch>
 +        <url>https://invisible-island.net/ncurses/ncurses.html</url>
 +        <summary>Ncurses libraries</summary>
 +        <description>The curses library routines are a terminal-independent method of
 +updating character screens with reasonable optimization.  The ncurses
 +(new curses) library is a freely distributable replacement for the
 +discontinued 4.4 BSD classic curses library.
 +
 +This package contains the ncurses libraries.</description>
 +      </application>
 +      <application>
 +        <name>setup</name>
 +        <version>2.13.7</version>
 +        <release>2.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://pagure.io/setup/</url>
 +        <summary>A set of system configuration and setup files</summary>
 +        <description>The setup package contains a set of important system configuration and
 +setup files, such as passwd, group, and profile.</description>
 +      </application>
 +      <application>
 +        <name>tzdata</name>
 +        <version>2021a</version>
 +        <release>1.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://www.iana.org/time-zones</url>
 +        <summary>Timezone data</summary>
 +        <description>This package contains data files with rules for various timezones around
 +the world.</description>
       </application>
     </applications>
   </operatingsystem>
 diff --git a/inspector/expected-fedora.img.xml b/inspector/expected-fedora.img.xml
 index df6060a73..72cddaf88 100644
 --- a/inspector/expected-fedora.img.xml
 +++ b/inspector/expected-fedora.img.xml
@@ -30,22 +30,212 @@
     </filesystems>
     <applications>
       <application>
 -        <name>test1</name>
 -        <version>1.0</version>
 -        <release>1.fc14</release>
 +        <name>basesystem</name>
 +        <version>11</version>
 +        <release>10.fc33</release>
 +        <arch>noarch</arch>
 +        <url>(none)</url>
 +        <summary>The skeleton package which defines a simple Fedora system</summary>
 +        <description>Basesystem defines the components of a basic Fedora system
 +(for example, the package installation order to use during bootstrapping).
 +Basesystem should be in every installation of a system, and it
 +should never be removed.</description>
 +      </application>
 +      <application>
 +        <name>bash</name>
 +        <version>5.0.17</version>
 +        <release>2.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>https://www.gnu.org/software/bash</url>
 +        <summary>The GNU Bourne Again shell</summary>
 +        <description>The GNU Bourne Again shell (Bash) is a shell or command language
 +interpreter that is compatible with the Bourne shell (sh). Bash
 +incorporates useful features from the Korn shell (ksh) and the C shell
 +(csh). Most sh scripts can be run by bash without modification.</description>
 +      </application>
 +      <application>
 +        <name>fedora-gpg-keys</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora RPM keys</summary>
 +        <description>This package provides the RPM signature keys.</description>
 +      </application>
 +      <application>
 +        <name>fedora-release</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora release files</summary>
 +        <description>Fedora release files such as various /etc/ files that define the release
 +and systemd preset files that determine which services are enabled by default.</description>
 +      </application>
 +      <application>
 +        <name>fedora-release-common</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora release files</summary>
 +        <description>Release files common to all Editions and Spins of Fedora</description>
 +      </application>
 +      <application>
 +        <name>fedora-release-identity-basic</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Package providing the basic Fedora identity</summary>
 +        <description>Provides the necessary files for a Fedora installation that is not identifying
 +itself as a particular Edition or Spin.</description>
 +      </application>
 +      <application>
 +        <name>fedora-repos</name>
 +        <version>33</version>
 +        <release>3</release>
 +        <arch>noarch</arch>
 +        <url>https://fedoraproject.org/</url>
 +        <summary>Fedora package repositories</summary>
 +        <description>Fedora package repository files for yum and dnf along with gpg public keys.</description>
 +      </application>
 +      <application>
 +        <name>filesystem</name>
 +        <version>3.14</version>
 +        <release>3.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>https://pagure.io/filesystem</url>
 +        <summary>The basic directory layout for a Linux system</summary>
 +        <description>The filesystem package is one of the basic packages that is installed
 +on a Linux system. Filesystem contains the basic directory layout
 +for a Linux operating system, including the correct permissions for
 +the directories.</description>
 +      </application>
 +      <application>
 +        <name>glibc</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>The GNU libc libraries</summary>
 +        <description>The glibc package contains standard libraries which are used by
 +multiple programs on the system. In order to save disk space and
 +memory, as well as to make upgrading easier, common system code is
 +kept in one place and shared between programs. This particular package
 +contains the most important sets of shared libraries: the standard C
 +library and the standard math library. Without these two libraries, a
 +Linux system will not function.</description>
 +      </application>
 +      <application>
 +        <name>glibc-all-langpacks</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
 +        <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>All language packs for glibc.</summary>
 +      </application>
 +      <application>
 +        <name>glibc-common</name>
 +        <version>2.32</version>
 +        <release>4.fc33</release>
         <arch>x86_64</arch>
 +        <url>http://www.gnu.org/software/glibc/</url>
 +        <summary>Common binaries and locale data for glibc</summary>
 +        <description>The glibc-common package includes common binaries for the GNU libc
 +libraries, as well as national language (locale) support.</description>
       </application>
       <application>
 -        <name>test2</name>
 -        <version>2.0</version>
 -        <release>2.fc14</release>
 +        <name>gpg-pubkey</name>
 +        <version>9570ff31</version>
 +        <release>5e3006fb</release>
 +        <arch>(none)</arch>
 +        <url>(none)</url>
 +        <summary>Fedora (33) &lt;fedora-33-primary@fedoraproject.org&gt; public key</summary>
 +        <description>-----BEGIN PGP PUBLIC KEY BLOCK-----
 +Version: rpm-4.16.1.2 (NSS-3)
 +
 +mQINBF4wBvsBEADQmcGbVUbDRUoXADReRmOOEMeydHghtKC9uRs9YNpGYZIB+bie
 +bGYZmflQayfh/wEpO2W/IZfGpHPL42V7SbyvqMjwNls/fnXsCtf4LRofNK8Qd9fN
 +kYargc9R7BEz/mwXKMiRQVx+DzkmqGWy2gq4iD0/mCyf5FdJCE40fOWoIGJXaOI1
 +Tz1vWqKwLS5T0dfmi9U4Tp/XsKOZGvN8oi5h0KmqFk7LEZr1MXarhi2Va86sgxsF
 +QcZEKfu5tgD0r00vXzikoSjn3qA5JW5FW07F1pGP4bF5f9J3CZbQyOjTSWMmmfTm
 +2d2BURWzaDiJN9twY2yjzkoOMuPdXXvovg7KxLcQerKT+FbKbq8DySJX2rnOA77k
 +UG4c9BGf/L1uBkAT8dpHLk6Uf5BfmypxUkydSWT1xfTDnw1MqxO0MsLlAHOR3J7c
 +oW9kLcOLuCQn1hBEwfZv7VSWBkGXSmKfp0LLIxAFgRtv+Dh+rcMMRdJgKr1V3FU+
 +rZ1+ZAfYiBpQJFPjv70vx+rGEgS801D3PJxBZUEy4Ic4ZYaKNhK9x9PRQuWcIBuW
 +6eTe/6lKWZeyxCumLLdiS75mF2oTcBaWeoc3QxrPRV15eDKeYJMbhnUai/7lSrhs
 +EWCkKR1RivgF4slYmtNE5ZPGZ/d61zjwn2xi4xNJVs8q9WRPMpHp0vCyMwARAQAB
 +tDFGZWRvcmEgKDMzKSA8ZmVkb3JhLTMzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
 +cmc+iQI4BBMBAgAiBQJeMAb7AhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK
 +CRBJ/XdJlXD/MZm2D/9kriL43vd3+0DNMeA82n2v9mSR2PQqKny39xNlYPyy/1yZ
 +P/KXoa4NYSCA971LSd7lv4n/h5bEKgGHxZfttfOzOnWMVSSTfjRyM/df/NNzTUEV
 +7ORA5GW18g8PEtS7uRxVBf3cLvWu5q+8jmqES5HqTAdGVcuIFQeBXFN8Gy1Jinuz
 +AH8rJSdkUeZ0cehWbERq80BWM9dhad5dW+/+Gv0foFBvP15viwhWqajr8V0B8es+
 +2/tHI0k86FAujV5i0rrXl5UOoLilO57QQNDZH/qW9GsHwVI+2yecLstpUNLq+EZC
 +GqTZCYoxYRpl0gAMbDLztSL/8Bc0tJrCRG3tavJotFYlgUK60XnXlQzRkh9rgsfT
 +EXbQifWdQMMogzjCJr0hzJ+V1d0iozdUxB2ZEgTjukOvatkB77DY1FPZRkSFIQs+
 +fdcjazDIBLIxwJu5QwvTNW8lOLnJ46g4sf1WJoUdNTbR0BaC7HHj1inVWi0p7IuN
 +66EPGzJOSjLK+vW+J0ncPDEgLCV74RF/0nR5fVTdrmiopPrzFuguHf9S9gYI3Zun
 +Yl8FJUu4kRO6JPPTicUXWX+8XZmE94aK14RCJL23nOSi8T1eW8JLW43dCBRO8QUE
 +Aso1t2pypm/1zZexJdOV8yGME3g5l2W6PLgpz58DBECgqc/kda+VWgEAp7rO2A==
 +=EPL3
 +-----END PGP PUBLIC KEY BLOCK-----
 +</description>
 +      </application>
 +      <application>
 +        <name>libgcc</name>
 +        <version>10.2.1</version>
 +        <release>9.fc33</release>
         <arch>x86_64</arch>
 +        <url>http://gcc.gnu.org</url>
 +        <summary>GCC version 10 shared support library</summary>
 +        <description>This package contains GCC shared support library which is needed
 +e.g. for exception handling support.</description>
 +      </application>
 +      <application>
 +        <name>ncurses-base</name>
 +        <version>6.2</version>
 +        <release>3.20200222.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://invisible-island.net/ncurses/ncurses.html</url>
 +        <summary>Descriptions of common terminals</summary>
 +        <description>This package contains descriptions of common terminals. Other terminal
 +descriptions are included in the ncurses-term package.</description>
       </application>
       <application>
 -        <name>test3</name>
 -        <version>3.0</version>
 -        <release>3.fc14</release>
 +        <name>ncurses-libs</name>
 +        <version>6.2</version>
 +        <release>3.20200222.fc33</release>
         <arch>x86_64</arch>
 +        <url>https://invisible-island.net/ncurses/ncurses.html</url>
 +        <summary>Ncurses libraries</summary>
 +        <description>The curses library routines are a terminal-independent method of
 +updating character screens with reasonable optimization.  The ncurses
 +(new curses) library is a freely distributable replacement for the
 +discontinued 4.4 BSD classic curses library.
 +
 +This package contains the ncurses libraries.</description>
 +      </application>
 +      <application>
 +        <name>setup</name>
 +        <version>2.13.7</version>
 +        <release>2.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://pagure.io/setup/</url>
 +        <summary>A set of system configuration and setup files</summary>
 +        <description>The setup package contains a set of important system configuration and
 +setup files, such as passwd, group, and profile.</description>
 +      </application>
 +      <application>
 +        <name>tzdata</name>
 +        <version>2021a</version>
 +        <release>1.fc33</release>
 +        <arch>noarch</arch>
 +        <url>https://www.iana.org/time-zones</url>
 +        <summary>Timezone data</summary>
 +        <description>This package contains data files with rules for various timezones around
 +the world.</description>
       </application>
     </applications>
   </operatingsystem>
 -- 
 2.31.1
--- a/SOURCES/0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch
+++ b/SOURCES/0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch
@ -0,0 +1,65 @@
 From 6657d0c1018ab44ae680376463ac3f0421548fb4 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Thu, 23 Dec 2021 11:36:59 +0100
 Subject: [PATCH] launch-libvirt: place our virtio-net-pci device in slot 0x1e
 The <qemu:commandline> trick we use for adding our virtio-net-pci device
 in the libvirt backend can conflict with libvirtd's and QEMU's PCI address
 assignment. Try to mitigate that by placing our device in slot 0x1e on the
 root bus. In practice this could only conflict with a "dmi-to-pci-bridge"
 device model, which libvirtd itself places in slot 0x1e. However, given
 the XMLs we generate, and modern QEMU versions, libvirtd has no reason to
 auto-add "dmi-to-pci-bridge". Refer to
 <https://libvirt.org/formatdomain.html#controllers>.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20211223103701.12702-2-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Tested-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 5ce5ef6a97a58c5e906083ad4e944545712b3f3f)
 ---
 lib/guestfs-internal.h | 11 +++++++++++
 lib/launch-libvirt.c   |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
 diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
 index 4799ee0a1..0b46f0070 100644
 --- a/lib/guestfs-internal.h
 +++ b/lib/guestfs-internal.h
@@ -147,6 +147,17 @@
 #define VIRTIO_DEVICE_NAME(type) type "-pci"
 #endif
 +/* Place the virtio-net controller in slot 0x1e on the root bus, on normal
 + * hardware with PCI. Refer to RHBZ#2034160.
 + */
 +#ifdef HAVE_LIBVIRT_BACKEND
 +#if defined(__arm__) || defined(__s390x__)
 +#define VIRTIO_NET_PCI_ADDR ""
 +#else
 +#define VIRTIO_NET_PCI_ADDR ",addr=1e.0"
 +#endif
 +#endif
 +
 /* Guestfs handle and associated structures. */
 /* State. */
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index 026dc6b26..5842319df 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1834,7 +1834,9 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
       } end_element ();
       start_element ("qemu:arg") {
 -        attribute ("value", VIRTIO_DEVICE_NAME ("virtio-net") ",netdev=usernet");
 +        attribute ("value", (VIRTIO_DEVICE_NAME ("virtio-net")
 +                             ",netdev=usernet"
 +                             VIRTIO_NET_PCI_ADDR));
       } end_element ();
     }
 -- 
 2.31.1
--- a/SOURCES/0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch
+++ b/SOURCES/0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch
@ -0,0 +1,70 @@
 From 4b9eac11db3e2cc9ace397ed4c804356a7d9adbf Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Thu, 23 Dec 2021 11:37:00 +0100
 Subject: [PATCH] lib: extract NETWORK_ADDRESS and NETWORK_PREFIX as macros
 The 169.254.0.0/16 network specification (for the appliance) is currently
 duplicated between the direct backend and the libvirt backend. In a
 subsequent patch, we're going to need the network specification in yet
 another spot; extract it now to the NETWORK_ADDRESS and NETWORK_PREFIX
 macros (simply as strings).
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20211223103701.12702-3-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Tested-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 216de164e091a5c36403f24901698044a43ae0d9)
 ---
 lib/guestfs-internal.h | 6 ++++++
 lib/launch-direct.c    | 2 +-
 lib/launch-libvirt.c   | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
 index 0b46f0070..97a13ff2c 100644
 --- a/lib/guestfs-internal.h
 +++ b/lib/guestfs-internal.h
@@ -158,6 +158,12 @@
 #endif
 #endif
 +/* Network address and network mask (expressed as address prefix) that the
 + * appliance will see (if networking is enabled).
 + */
 +#define NETWORK_ADDRESS "169.254.0.0"
 +#define NETWORK_PREFIX  "16"
 +
 /* Guestfs handle and associated structures. */
 /* State. */
 diff --git a/lib/launch-direct.c b/lib/launch-direct.c
 index b6ed9766f..de17d2167 100644
 --- a/lib/launch-direct.c
 +++ b/lib/launch-direct.c
@@ -681,7 +681,7 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
     start_list ("-netdev") {
       append_list ("user");
       append_list ("id=usernet");
 -      append_list ("net=169.254.0.0/16");
 +      append_list ("net=" NETWORK_ADDRESS "/" NETWORK_PREFIX);
     } end_list ();
     start_list ("-device") {
       append_list (VIRTIO_DEVICE_NAME ("virtio-net"));
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index 5842319df..0f38f0aec 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1826,7 +1826,8 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
       } end_element ();
       start_element ("qemu:arg") {
 -        attribute ("value", "user,id=usernet,net=169.254.0.0/16");
 +        attribute ("value",
 +                   "user,id=usernet,net=" NETWORK_ADDRESS "/" NETWORK_PREFIX);
       } end_element ();
       start_element ("qemu:arg") {
 -- 
 2.31.1
--- a/SOURCES/0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch
+++ b/SOURCES/0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch
@ -0,0 +1,91 @@
 From 8570de6e766297e4c9feab1c54ae05037f33edeb Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Thu, 23 Dec 2021 11:37:01 +0100
 Subject: [PATCH] launch-libvirt: add virtio-net via the standard <interface>
 element
 Starting with version 3.8.0, libvirt allows us to specify the network
 address and network mask (as prefix) for SLIRP directly via the
 <interface> element in the domain XML:
 <https://libvirt.org/formatdomain.html#userspace-slirp-stack>. This means
 we don't need the <qemu:commandline> hack for virtio-net on such versions.
 Restrict the hack in construct_libvirt_xml_qemu_cmdline() to
 libvirt<3.8.0, and generate the proper <interface> element in
 construct_libvirt_xml_devices() on libvirt>=3.8.0.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2034160
 Suggested-by: Richard W.M. Jones <rjones@redhat.com>
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20211223103701.12702-4-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Tested-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 5858c2cf6c24b3776e3867eafd9d86a1f4912d9c)
 ---
 lib/guestfs-internal.h |  3 ++-
 lib/launch-libvirt.c   | 27 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)
 diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
 index 97a13ff2c..b11c945e9 100644
 --- a/lib/guestfs-internal.h
 +++ b/lib/guestfs-internal.h
@@ -148,7 +148,8 @@
 #endif
 /* Place the virtio-net controller in slot 0x1e on the root bus, on normal
 - * hardware with PCI. Refer to RHBZ#2034160.
 + * hardware with PCI. Necessary only before libvirt 3.8.0. Refer to
 + * RHBZ#2034160.
  */
 #ifdef HAVE_LIBVIRT_BACKEND
 #if defined(__arm__) || defined(__s390x__)
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index 0f38f0aec..f6bb39d99 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1396,6 +1396,28 @@ construct_libvirt_xml_devices (guestfs_h *g,
       } end_element ();
     } end_element ();
 +    /* Virtio-net NIC with SLIRP (= userspace) back-end, if networking is
 +     * enabled. Starting with libvirt 3.8.0, we can specify the network address
 +     * and prefix for SLIRP in the domain XML. Therefore, we can add the NIC
 +     * via the standard <interface> element rather than <qemu:commandline>, and
 +     * so libvirt can manage the PCI address of the virtio-net NIC like the PCI
 +     * addresses of all other devices. Refer to RHBZ#2034160.
 +     */
 +    if (g->enable_network &&
 +        guestfs_int_version_ge (&params->data->libvirt_version, 3, 8, 0)) {
 +      start_element ("interface") {
 +        attribute ("type", "user");
 +        start_element ("model") {
 +          attribute ("type", "virtio");
 +        } end_element ();
 +        start_element ("ip") {
 +          attribute ("family", "ipv4");
 +          attribute ("address", NETWORK_ADDRESS);
 +          attribute ("prefix", NETWORK_PREFIX);
 +        } end_element ();
 +      } end_element ();
 +    }
 +
     /* Libvirt adds some devices by default.  Indicate to libvirt
      * that we don't want them.
      */
@@ -1818,9 +1840,10 @@ construct_libvirt_xml_qemu_cmdline (guestfs_h *g,
     } end_element ();
     /* Workaround because libvirt user networking cannot specify "net="
 -     * parameter.
 +     * parameter. Necessary only before libvirt 3.8.0; refer to RHBZ#2034160.
      */
 -    if (g->enable_network) {
 +    if (g->enable_network &&
 +        !guestfs_int_version_ge (&params->data->libvirt_version, 3, 8, 0)) {
       start_element ("qemu:arg") {
         attribute ("value", "-netdev");
       } end_element ();
 -- 
 2.31.1
--- a/SOURCES/0020-appliance-Use-cpu-max.patch
+++ b/SOURCES/0020-appliance-Use-cpu-max.patch
@ -0,0 +1,86 @@
 From fbb053fc71c0c072acb3fbf6e5fbbfc3b0667fd2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 28 Jan 2021 12:20:49 +0000
 Subject: [PATCH] appliance: Use -cpu max.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 QEMU has a newish feature (from about 2017 / qemu 2.9) called -cpu max
 which is supposed to select the best CPU, ideal for libguestfs.
 After this change, on x86-64:
               KVM                          TCG
 Direct         -cpu max                     -cpu max
 (non-libvirt)
 Libvirt   <cpu mode="host-passthrough">     <cpu mode="host-model">
            <model fallback="allow"/>         <model fallback="allow"/>
          </cpu>                            </cpu>
 Thanks: Daniel Berrangé
 (cherry picked from commit 30f74f38bd6e42e783ba80895f4d6826abddd417)
 ---
 lib/appliance-cpu.c  | 16 ++++++++--------
 lib/launch-libvirt.c |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
 diff --git a/lib/appliance-cpu.c b/lib/appliance-cpu.c
 index 5ef9f5c72..54ac6e2e3 100644
 --- a/lib/appliance-cpu.c
 +++ b/lib/appliance-cpu.c
@@ -38,6 +38,11 @@
  *
  * The literal string C<"host"> means use C<-cpu host>.
  *
 + * =item C<"max">
 + *
 + * The literal string C<"max"> means use C<-cpu max> (the best
 + * possible).  This requires awkward translation for libvirt.
 + *
  * =item some string
  *
  * Some string such as C<"cortex-a57"> means use C<-cpu cortex-a57>.
@@ -80,14 +85,9 @@ guestfs_int_get_cpu_model (int kvm)
   /* See discussion in https://bugzilla.redhat.com/show_bug.cgi?id=1605071 */
   return NULL;
 #else
 -  /* On most architectures, it is faster to pass the CPU host model to
 -   * the appliance, allowing maximum speed for things like checksums
 -   * and encryption.  Only do this with KVM.  It is broken in subtle
 -   * ways on TCG, and fairly pointless when you're emulating anyway.
 +  /* On most architectures we can use "max" to get the best possible CPU.
 +   * For recent qemu this should work even on TCG.
    */
 -  if (kvm)
 -    return "host";
 -  else
 -    return NULL;
 +  return "max";
 #endif
 }
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index f6bb39d99..e3ff1ffe0 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1169,6 +1169,15 @@ construct_libvirt_xml_cpu (guestfs_h *g,
           attribute ("fallback", "allow");
         } end_element ();
       }
 +      else if (STREQ (cpu_model, "max")) {
 +        if (params->data->is_kvm)
 +          attribute ("mode", "host-passthrough");
 +        else
 +          attribute ("mode", "host-model");
 +        start_element ("model") {
 +          attribute ("fallback", "allow");
 +        } end_element ();
 +      }
       else
         single_element ("model", cpu_model);
     } end_element ();
 -- 
 2.31.1
--- a/SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch
+++ b/SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch
@ -0,0 +1,48 @@
 From 7dde1007525ec235e769351be15ca5de34eeda4a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 18 Mar 2021 12:32:26 +0000
 Subject: [PATCH] appliance: Use <cpu mode="maximum"/> for -cpu max on libvirt.
 Note this requires libvirt >= 7.1.0 which was only released in March 2021.
 With an older libvirt you will see this error:
  Original error from libvirt: unsupported configuration: Invalid mode attribute 'maximum' [code=67 int1=-1]
 In theory we could check if this is supported by looking at the
 libvirt capabilities and fall back, but this commit does not do that,
 in the expectation that most people will be using the default backend
 (direct) and on Fedora/RHEL we will add an explicit minimum version
 dependency to the package.
 qemu support has been around quite a bit longer (at least since 2017).
 Fixes: commit 30f74f38bd6e42e783ba80895f4d6826abddd417
 (cherry picked from commit 13ceb6a87b2869909a6a0e3c8caa962b72e4cb0e)
 ---
 lib/launch-libvirt.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index e3ff1ffe0..db619910f 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1170,13 +1170,8 @@ construct_libvirt_xml_cpu (guestfs_h *g,
         } end_element ();
       }
       else if (STREQ (cpu_model, "max")) {
 -        if (params->data->is_kvm)
 -          attribute ("mode", "host-passthrough");
 -        else
 -          attribute ("mode", "host-model");
 -        start_element ("model") {
 -          attribute ("fallback", "allow");
 -        } end_element ();
 +        /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
 +        attribute ("mode", "maximum");
       }
       else
         single_element ("model", cpu_model);
 -- 
 2.31.1
--- a/SOURCES/0022-lib-Disable-5-level-page-tables-when-using-cpu-max.patch
+++ b/SOURCES/0022-lib-Disable-5-level-page-tables-when-using-cpu-max.patch
@ -0,0 +1,92 @@
 From bb19cc0cdd43619ccf830e1e608f79e46f8ddf86 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 12 May 2022 08:36:37 +0100
 Subject: [PATCH] lib: Disable 5-level page tables when using -cpu max
 In https://bugzilla.redhat.com/show_bug.cgi?id=2082806 we've been
 tracking an insidious qemu bug which intermittently prevents the
 libguestfs appliance from starting.  The symptoms are that SeaBIOS
 starts and displays its messages, but the kernel isn't reached.  We
 found that the kernel does in fact start, but when it tries to set up
 page tables and jump to protected mode it gets a triple fault which
 causes the emulated CPU in qemu to reset (qemu exits).
 This seems to only affect TCG (not KVM).
 Yesterday I found that this is caused by using -cpu max which enables
 the "la57" feature (5-level page tables[0]), and that we can make the
 problem go away using -cpu max,la57=off.  Note that I still don't
 fully understand the qemu bug, so this is only a workaround.
 I chose to disable 5-level page tables for both TCG and KVM, partly to
 make the patch simpler, and partly because I guess it's not a feature
 (ie. 57 bit linear addresses) that is useful for the libguestfs
 appliance case, where we have limited physical memory and no need to
 run any programs with huge address spaces.
 I tested this by running both the direct & libvirt paths overnight.  I
 expect that this patch will fail with old qemu/libvirt which doesn't
 understand the "la57" feature, but this is only intended as a
 temporary workaround.
 [0] Article about 5-level page tables as background:
 https://lwn.net/Articles/717293/
 Thanks: Laszlo Ersek
 Fixes: https://answers.launchpad.net/ubuntu/+source/libguestfs/+question/701625
 [RHEL 8.7: Patch is not upstream.  This is the initial patch as posted
 to the mailing list here:
 https://listman.redhat.com/archives/libguestfs/2022-May/028853.html]
 ---
 lib/launch-direct.c  | 15 +++++++++++++--
 lib/launch-libvirt.c |  7 +++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 diff --git a/lib/launch-direct.c b/lib/launch-direct.c
 index de17d2167..6b28e4724 100644
 --- a/lib/launch-direct.c
 +++ b/lib/launch-direct.c
@@ -534,8 +534,19 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
   } end_list ();
   cpu_model = guestfs_int_get_cpu_model (has_kvm && !force_tcg);
 -  if (cpu_model)
 -    arg ("-cpu", cpu_model);
 +  if (cpu_model) {
 +#if defined(__x86_64__)
 +    /* Temporary workaround for RHBZ#2082806 */
 +    if (STREQ (cpu_model, "max")) {
 +      start_list ("-cpu") {
 +        append_list (cpu_model);
 +        append_list ("la57=off");
 +      } end_list ();
 +    }
 +    else
 +#endif
 +      arg ("-cpu", cpu_model);
 +  }
   if (g->smp > 1)
     arg_format ("-smp", "%d", g->smp);
 diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
 index db619910f..bad4a54ea 100644
 --- a/lib/launch-libvirt.c
 +++ b/lib/launch-libvirt.c
@@ -1172,6 +1172,13 @@ construct_libvirt_xml_cpu (guestfs_h *g,
       else if (STREQ (cpu_model, "max")) {
         /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
         attribute ("mode", "maximum");
 +#if defined(__x86_64__)
 +        /* Temporary workaround for RHBZ#2082806 */
 +        start_element ("feature") {
 +          attribute ("policy", "disable");
 +          attribute ("name", "la57");
 +        } end_element ();
 +#endif
       }
       else
         single_element ("model", cpu_model);
 -- 
 2.31.1
--- a/SOURCES/0023-docs-guestfs-security-document-CVE-2022-2211.patch
+++ b/SOURCES/0023-docs-guestfs-security-document-CVE-2022-2211.patch
@ -0,0 +1,103 @@
 From 22d779d5982dc82d629710d41973ed6545707bd9 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Tue, 28 Jun 2022 13:54:16 +0200
 Subject: [PATCH] docs/guestfs-security: document CVE-2022-2211
 Short log for the common submodule, commit range
 f8de5508fe75..35467027f657:
 Laszlo Ersek (2):
      mlcustomize: factor out pkg install/update/uninstall from guestfs-tools
      options: fix buffer overflow in get_keys() [CVE-2022-2211]
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2100862
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220628115418.5376-2-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Cherry picked from commit 99844660b48ed809e37378262c65d63df6ce4a53.
 For the cherry pick I only added one submodule commit:
 options: fix buffer overflow in get_keys() [CVE-2022-2211]
 ---
 common                    |  2 +-
 docs/guestfs-security.pod | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 Submodule common be09523d6..1174b443a:
 diff --git a/common/options/keys.c b/common/options/keys.c
 index 798315c..d27a712 100644
 --- a/common/options/keys.c
 +++ b/common/options/keys.c
@@ -128,17 +128,23 @@ read_first_line_from_file (const char *filename)
 char **
 get_keys (struct key_store *ks, const char *device, const char *uuid)
 {
 -  size_t i, j, len;
 +  size_t i, j, nmemb;
   char **r;
   char *s;
   /* We know the returned list must have at least one element and not
    * more than ks->nr_keys.
    */
 -  len = 1;
 -  if (ks)
 -    len = MIN (1, ks->nr_keys);
 -  r = calloc (len+1, sizeof (char *));
 +  nmemb = 1;
 +  if (ks && ks->nr_keys > nmemb)
 +    nmemb = ks->nr_keys;
 +
 +  /* make room for the terminating NULL */
 +  if (nmemb == (size_t)-1)
 +    error (EXIT_FAILURE, 0, _("size_t overflow"));
 +  nmemb++;
 +
 +  r = calloc (nmemb, sizeof (char *));
   if (r == NULL)
     error (EXIT_FAILURE, errno, "calloc");
 diff --git a/docs/guestfs-security.pod b/docs/guestfs-security.pod
 index 9ceef5623..efa35b29d 100644
 --- a/docs/guestfs-security.pod
 +++ b/docs/guestfs-security.pod
@@ -406,6 +406,34 @@ The libvirt backend is not affected.
 The solution is to update qemu to a version containing the fix (see
 L<https://lists.gnu.org/archive/html/qemu-devel/2018-06/msg01012.html>).
 +=head2 CVE-2022-2211
 +
 +L<https://bugzilla.redhat.com/CVE-2022-2211>
 +
 +The C<get_keys> function in F<libguestfs-common/options/keys.c> collects
 +those I<--key> options from the command line into a new array that match
 +a particular block device that's being decrypted for inspection. The
 +function intends to size the result array such that potentially all
 +I<--key> options, plus a terminating C<NULL> element, fit into it. The
 +code mistakenly uses the C<MIN> macro instead of C<MAX>, and therefore
 +only one element is allocated before the C<NULL> terminator.
 +
 +Passing precisely two I<--key ID:...> options on the command line for
 +the encrypted block device C<ID> causes C<get_keys> to overwrite the
 +terminating C<NULL>, leading to an out-of-bounds read in
 +C<decrypt_mountables>, file F<libguestfs-common/options/decrypt.c>.
 +
 +Passing more than two I<--key ID:...> options on the command line for
 +the encrypted block device C<ID> causes C<get_keys> itself to perform
 +out-of-bounds writes. The most common symptom is a crash with C<SIGSEGV>
 +later on.
 +
 +This issue affects -- broadly speaking -- all libguestfs-based utilities
 +that accept I<--key>, namely: C<guestfish>, C<guestmount>, C<virt-cat>,
 +C<virt-customize>, C<virt-diff>, C<virt-edit>, C<virt-get-kernel>,
 +C<virt-inspector>, C<virt-log>, C<virt-ls>, C<virt-sparsify>,
 +C<virt-sysprep>, C<virt-tail>, C<virt-v2v>.
 +
 =head1 SEE ALSO
 L<guestfs(3)>,
 -- 
 2.31.1
--- a/SOURCES/README-replacement.in
+++ b/SOURCES/README-replacement.in
@ -8,7 +8,8 @@ list:
  http://www.redhat.com/mailman/listinfo/libguestfs
-This package comes with a lot of help and examples to get you started.
+This Red Hat Enterprise Linux package comes with a lot of help and
 examples to get you started.
 The first place to start are the manual pages.  Type:
@ -19,19 +20,19 @@ The first place to start are the manual pages.  Type:
  man virt-cat   # and other virt-* tools
 If you install the libguestfs-devel package, then in the
-/usr/share/doc/libguestfs-devel/ directory you will find other
+/usr/share/doc/libguestfs-devel/ directory you will also
-documentation including:
+find:
 - BUGS: list of open bugs in this version
- - ChangeLog.gz: the detailed list of changes in this version
+ - ChangeLog: the detailed list of changes in this version
- - HACKING: how to extend libguestfs
+ - ROADMAP: the roadmap for future versions
 - TODO: ideas for extending libguestfs
 - *.c: example C programs using the API
- - *.xml.gz: example virt-inspector output (compressed)
+ - *.xml: example virt-inspector output
- - virt-inspector.rng: virt-inspector RelaxNG schema
+ - *.rng: virt-inspector RelaxNG schema
--- a/SOURCES/copy-patches.sh
+++ b/SOURCES/copy-patches.sh
@ -3,11 +3,10 @@
 set -e
 # Maintainer script to copy patches from the git repo to the current
-# directory.  It's normally only used downstream (ie. in RHEL).  Use
+# directory.  Use it like this:
 # it like this:
 #   ./copy-patches.sh
-rhel_version=10.0
+rhel_version=8.7.0
 # Check we're in the right directory.
 if [ ! -f libguestfs.spec ]; then
--- a/SOURCES/guestfish.sh
+++ b/SOURCES/guestfish.sh
--- a/SOURCES/libguestfs-1.44.0.tar.gz.sig
+++ b/SOURCES/libguestfs-1.44.0.tar.gz.sig
@ -0,0 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAl/1jrcRHHJpY2hAYW5u
 ZXhpYS5vcmcACgkQkXOPc+G3aKCBcQ/+JwE8JTm3PdTPGoKxCqSgAOirbqE4ZvMY
 p/3y5mexagcWXx6X2Y+u6dlybS06jFR8TkbjdE3VAhhJo0C8l1vfvUTWKVDZoBhG
 3jZ6e+exff3VEUY4nFIVvYPNP+/J1BCiexMO0/2f1MDKwnJ73je9GlzwPEpdqPj/
 jSxaAy1G/rA5qV5rWQd4n5S9m8zRnf1lnM7YI7I0PunC2Wt/U6BZidL/FVVWVBxV
 DGKTIy7GgWnfGWdqJ+Wi9o9QCJH/9FGTP35xonyQEM/7GI+jLz+a9g2xgvv584Ni
 FF0Gqywrp5QFd13Nj3MPM7MXjGjUY5vB964k3mgE4fH91CnVvisRWfUCCo+c/9wG
 odS0YTrveWJpm0oYU2tL3AjahRclskAxXEIxx9kbnWMUTrpXG0r8G4+vE+estCjb
 mbyK5FQh2KASqNgmeopjK9DAEwD7SfPyHmPQ07Q76Pgl8X+FfBX2uyXBjaR5IJJJ
 qVVamdVtPilqwWqQ8hGkKE0qVKqZHGCOJ8+AkQjHjUtSVegT6zHmCG/bM4im1dGV
 r9fv6oQ7kWViz8mBluoETWr5sd2AfLOdLS8A42JaOnU7ASJUX/9eN0Y9u4BYC9P3
 l+QXikyq6T/4iC+tADOYGBr9uNitksLwSSUYScpnN+4AY+M+qjXTBq38MEHmwcgK
 5mwscgQefcY=
 =UrAA
 -----END PGP SIGNATURE-----
--- a/SOURCES/yum.conf.in
+++ b/SOURCES/yum.conf.in
--- a/SPECS/libguestfs.spec
+++ b/SPECS/libguestfs.spec
--- a/gating.yaml
+++ b/gating.yaml
@ -1,6 +0,0 @@
 --- !Policy
 product_versions:
  - rhel-*
 decision_context: osci_compose_gate
 rules:
  - !PassingTestCaseRule {test_case_name: xen-ci.brew-build.tier1.functional}
--- a/libguestfs.keyring
+++ b/libguestfs.keyring
--- a/2
+++ b/2
@ -1,2 +0,0 @@
 SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86
 SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,13 +0,0 @@
 # https://fedoraproject.org/wiki/CI/Tests
 # https://fedoraproject.org/wiki/CI/Standard_Test_Roles
 - hosts: localhost
  roles:
  - role: standard-test-basic
    tags:
    - classic
    tests:
    - libguestfs-test-tool:
        dir: .
        run: libguestfs-test-tool
    required_packages:
    - libguestfs
		`@ -0,0 +1,2 @@`
							`99d241dc4a5ba0dc6111954ed7a872e0b0bb6944 SOURCES/libguestfs-1.44.0.tar.gz`
							`1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring`
		`@ -1,2 +0,0 @@`
			`SHA512 (libguestfs-1.54.0.tar.gz) = 45fd91a36384c15737820c9157d4a8a670c94177ab917a2600fef04ecbc8d6531ef04a4a86bea6540e04a550de7dfacbef9645f2869e7c5eab6cb63058ff2d86`
			`SHA512 (libguestfs-1.54.0.tar.gz.sig) = 97c27a5cafa533587ae2e22a54fed16d37c5366cca2a4c40cb098a8dacf62ee8b1bcee9d28f63b01e7034f0f211e8a8c71368ae418f1bfba4970ca1942bf40f3`