[Libguestfs] [PATCH v2 7/7] lib/canonical-name.c: Hide errors.

Richard W.M. Jones rjones at redhat.com
Mon Sep 7 09:44:00 UTC 2020


Fixes “XXX” comment.  This turns out to be necessary in order to
suppress a warning when inspecting Windows BitLocker-encrypted guests.

The warning (which still appears in debugging output even with this
patch) is:

  libguestfs: error: lvm_canonical_lv_name: /dev/mapper/cryptsda2: not a logical volume
---
 lib/canonical-name.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/canonical-name.c b/lib/canonical-name.c
index 052bbf12c..11cf6fed6 100644
--- a/lib/canonical-name.c
+++ b/lib/canonical-name.c
@@ -46,8 +46,9 @@ guestfs_impl_canonical_device_name (guestfs_h *g, const char *device)
   }
   else if (STRPREFIX (device, "/dev/mapper/") ||
            STRPREFIX (device, "/dev/dm-")) {
-    /* XXX hide errors */
+    guestfs_push_error_handler (g, NULL, NULL);
     ret = guestfs_lvm_canonical_lv_name (g, device);
+    guestfs_pop_error_handler (g);
     if (ret == NULL)
       ret = safe_strdup (g, device);
   }
-- 
2.27.0




More information about the Libguestfs mailing list