From 6168ae3ca918573c25a980dc54789668d10688e4 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Date: Wed, 29 Apr 2026 17:42:44 +0530 Subject: [PATCH 1/2] Skip QemuImgTest when libvirt native library cannot load --- .../test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java index 5a0274257764..d4d67fa71c93 100644 --- a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java +++ b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java @@ -57,7 +57,7 @@ public static void setUp() { Connect conn = new Connect("qemu:///system", false); conn.getVersion(); libVirtAvailable = true; - } catch (LibvirtException ignored) {} + } catch (LibvirtException | LinkageError ignored) {} Assume.assumeTrue("libvirt not available", libVirtAvailable); } From 5f16427c3deb49ce1f0169e4088db02c53b1c9c3 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Date: Wed, 29 Apr 2026 19:07:46 +0530 Subject: [PATCH 2/2] Narrow native libvirt loading error handling in QemuImgTest --- .../test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java index d4d67fa71c93..140302590ba2 100644 --- a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java +++ b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImgTest.java @@ -57,7 +57,7 @@ public static void setUp() { Connect conn = new Connect("qemu:///system", false); conn.getVersion(); libVirtAvailable = true; - } catch (LibvirtException | LinkageError ignored) {} + } catch (LibvirtException | UnsatisfiedLinkError | ExceptionInInitializerError ignored) {} Assume.assumeTrue("libvirt not available", libVirtAvailable); }