From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Mon, 10 Jan 2011 14:05:45 +0000 (+0100)
Subject: vbox: Silently ignore missing registry key on Windows
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e4570729eee65ec270eb2916c1761abc577f2d76;p=libvirt.git

vbox: Silently ignore missing registry key on Windows

Don't report an error when the VirtualBox registry key is missing,
as this just indicates that VirtualBox is not installed in general.

This matches the behavior of the XPCOM glue that silently ignores
a missing VBoxXPCOMC.so.
---

diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index e6a886f7aa..e31a76328f 100644
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -356,8 +356,9 @@ vboxLookupVersionInRegistry(void)
         status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, keyName, 0, KEY_READ, &key);
 
         if (status != ERROR_SUCCESS) {
-            VIR_ERROR(_("Could not open registry key '%s' nor '%s'"),
-                      VBOX_REGKEY_ORACLE, VBOX_REGKEY_SUN);
+            /* Both keys aren't there, or we cannot open them. In general this
+             * indicates that VirtualBox is not installed, so we just silently
+             * fail here making vboxRegister() register the dummy driver. */
             return -1;
         }
     }