return VIR_DRV_OPEN_DECLINED instead of VIR_DRV_OPEN_ERROR when vbox can't be

found so other hypervisors can be probed. Patch by Pritesh Kothari.

diff --git a/ChangeLog b/ChangeLog
index 9b803bb1a68a23a90d540c7de2a86c6021043366..e835dfc573c54943d1370bb5abd283e21d50168a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri May  8 12:15:05 CEST 2009 Guido Günther <agx@sigxcpu.org>
+
+       * src/vbox/vbox_tmpl.c (virDrvOpen): return VIR_DRV_OPEN_DECLINED
+         instead of VIR_DRV_OPEN_ERROR when vbox can't be found so other
+         hypervisors can be probed. Patch by Pritesh Kothari.
+
 Fri May  8 12:09:12 CEST 2009 Guido Günther <agx@sigxcpu.org>
 
        * src/vbox/vbox_tmpl.c (vboxUninitialize): fix crash when init fails

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 6507a697827dc170f9b6f132bfe69c3e37a0a90f..30632111ec6c7c3dd95654739c1022cac42c81bd 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -351,7 +351,7 @@ static virDrvOpenStatus vboxOpen(virConnectPtr conn,
     return VIR_DRV_OPEN_SUCCESS;
 cleanup:
     vboxUninitialize(data);
-    return VIR_DRV_OPEN_ERROR;
+    return VIR_DRV_OPEN_DECLINED;
 }
 
 static int vboxClose(virConnectPtr conn) {