]> xenbits.xensource.com Git - libvirt.git/commitdiff
Prefer UDEV to HAL drivers if both a compiled
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 28 May 2010 10:16:44 +0000 (11:16 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 8 Jun 2010 14:15:02 +0000 (15:15 +0100)
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

index f7e2f6999f3ba724dfc80842952c691d41662705..b0ff662c5b07aef96bfdb27b9ede48efe0561a90 100644 (file)
@@ -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