From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Fri, 29 Oct 2010 14:31:29 +0000 (+0200)
Subject: vbox: Don't warn when the linker search path doesn't contain VBoxXPCOMC.so
X-Git-Tag: v0.8.5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eb99c4a6cd3e66980d32a16189348696e8f547a;p=thirdparty%2Flibvirt.git

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

This is actually a workaround, to unbreak make check on systems
without VirtualBox.
---

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 7648e547fa..15a9622d95 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;
     }