[Libguestfs] [libguestfs-common PATCH 1/3] options: assume GUESTFS_HAVE_LUKS_UUID and GUESTFS_HAVE_CRYPTSETUP_OPEN

guestfs_luks_uuid() was added in libguestfs 1.42 (released March 2020). guestfs_cryptsetup_open was added in libguestfs 1.44 (Jan 2021). guestfs-tools already requires libguestfs >= 1.44 (see guestfs-tools.git/m4/guestfs-libraries.m4), as of commit 27da4b0c4991. The libguestfs version required in virt-v2v.git/m4/guestfs-libraries.m4 will have to be bumped to 1.44 (at commit 6711106145f9, the requirement is 1.40). Suggested-by: Richard W.M. Jones <rjones(a)redhat.com&gt; Signed-off-by: Laszlo Ersek <lersek(a)redhat.com&gt; --- options/decrypt.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/options/decrypt.c b/options/decrypt.c index f7c1d876b3ed..6e0ea95f1716 100644 --- a/options/decrypt.c +++ b/options/decrypt.c @@ -92,9 +92,7 @@ decrypt_mountables (guestfs_h *g, const char * const *mountables, * (unclear if this is a limitation of the format or cryptsetup). */ if (STREQ (type, "crypto_LUKS")) { -#ifdef GUESTFS_HAVE_LUKS_UUID uuid = guestfs_luks_uuid (g, mountable); -#endif } else if (STRNEQ (type, "BitLocker")) continue; @@ -115,14 +113,10 @@ decrypt_mountables (guestfs_h *g, const char * const *mountables, int r; guestfs_push_error_handler (g, NULL, NULL); -#ifdef GUESTFS_HAVE_CRYPTSETUP_OPEN /* XXX Should we set GUESTFS_CRYPTSETUP_OPEN_READONLY if readonly is * set? This might break 'mount_ro'. */ r = guestfs_cryptsetup_open (g, mountable, key, mapname, -1); -#else - r = guestfs_luks_open (g, mountable, key, mapname); -#endif guestfs_pop_error_handler (g); if (r == 0) -- 2.19.1.3.g30247aa5d201