[libvirt] [PATCH] 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 --- 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
On 05/28/2010 04:17 AM, Daniel P. Berrange wrote:
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
ACK. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Fri, May 28, 2010 at 11:17:38AM +0100, Daniel P. Berrange wrote:
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
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
ACK Dave
participants (3)
-
Daniel P. Berrange -
Dave Allan -
Eric Blake