From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 28 May 2010 10:16:44 +0000 (+0100)
Subject: Prefer UDEV to HAL drivers if both a compiled
X-Git-Tag: v0.8.2~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=345ff369e5e5869d5bf5b951ba8281f64408beae;p=thirdparty%2Flibvirt.git

Prefer UDEV to HAL drivers if both a compiled

HAL is deprecated and UDEV is the future. Thus if both
options are compiled, we should prefer use of UDEV over
HAL

* src/node_device/node_device_driver.c: Switch init
  order to try UDEV first, then HAL
---

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index f7e2f6999f..b0ff662c5b 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -646,8 +646,8 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr driver)
 int nodedevRegister(void) {
 #if defined(HAVE_HAL) && defined(HAVE_UDEV)
     /* Register only one of these two - they conflict */
-    if (halNodeRegister() == -1)
-        return udevNodeRegister();
+    if (udevNodeRegister() == -1)
+        return halNodeRegister();
     return 0;
 #else
 # ifdef HAVE_HAL