[libvirt] [PATCH] vbox: Don't warn when the linker search path doesn't contain VBoxXPCOMC.so

29 Oct 2010

This is actually a workaround, to unbreak make check on systems
without VirtualBox.
---
 src/vbox/vbox_XPCOMCGlue.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 7648e54..15a9622 100644
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -124,7 +124,14 @@ static int tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing)
     g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL);
 
     if (g_hVBoxXPCOMC == NULL) {
-        VIR_WARN("Could not dlopen '%s': %s", name, dlerror());
+        /*
+         * FIXME: Don't warn in this case as it currently breaks make check
+         *        on systems without VirtualBox.
+         */
+        if (dir != NULL) {
+            VIR_WARN("Could not dlopen '%s': %s", name, dlerror());
+        }
+
         goto cleanup;
     }
 
-- 
1.7.0.4

    

Matthias Bolte

Eric Blake

tags

participants (2)