diff --git a/0001-lib-Autodetect-backing-format-for-qemu-img-create-b.patch b/0001-lib-Autodetect-backing-format-for-qemu-img-create-b.patch deleted file mode 100644 index 9a2250f..0000000 --- a/0001-lib-Autodetect-backing-format-for-qemu-img-create-b.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 45de287447bb18d59749fbfc1ec5072413090109 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -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 ---- - 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.32.0 - diff --git a/libguestfs.spec b/libguestfs.spec index 0151c70..eb3414e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -56,8 +56,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.45.6 -Release: 12%{?dist} +Version: 1.45.7 +Release: 1%{?dist} License: LGPLv2+ # Build only for architectures that have a kernel @@ -1143,8 +1143,9 @@ rm ocaml/html/.gitignore %changelog -* Tue Aug 31 2021 Richard W.M. Jones - 1:1.45.6-12 -- Upstream patch to work with qemu 6.1 (RHBZ#1998820) +* Tue Aug 31 2021 Richard W.M. Jones - 1:1.45.7-1 +- New upstream development version 1.45.7. +- Fix to work with qemu 6.1 (RHBZ#1998820) * Fri Aug 06 2021 Richard W.M. Jones - 1:1.45.6-11 - Fix license files. diff --git a/sources b/sources index 33a2bac..b1659fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libguestfs-1.45.6.tar.gz) = 018aec83d153aeabb7c0b255e6d5b40b03ff6d0de12dc1e0557fc35215db593aaa871c4bc1f44e785f74bf02a367aec0e90157f8ff159cccc820ebf1afd2258a -SHA512 (libguestfs-1.45.6.tar.gz.sig) = 8f0be35a265356e7bd823b3d9302449ac62d633de8a9bd40ca457bcb4e4d2aebc827c4867bfdb6f3e3a4f34ade168103f5af0a44b667c875be7721e275433dbe +SHA512 (libguestfs-1.45.7.tar.gz) = 16cdfb59077f753908b46a5a7ffcbb5b878cd224fa4a5b87878ebae2c0c3981f0b68f2df2c35c9f44676886922eb9afbcdacb5d6ee2d34b28e053440face7132 +SHA512 (libguestfs-1.45.7.tar.gz.sig) = 1a999eba5275821e7013deea3803aa2ad2ebcd082b8f9a978ffce45e23d3f42af4c5e78700914d79804b42530c1cfd629d98b4977fe35bd11ed3f97dad705ea9