[libvirt] [PATCH] Prefer UDEV to HAL drivers if both a compiled

Daniel P. Berrange berrange at redhat.com
Fri May 28 10:17:38 UTC 2010


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
---
 src/node_device/node_device_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index a6c1fa0..42363be 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -658,8 +658,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
-- 
1.6.6.1




More information about the libvir-list mailing list