From 466f86052fe90d8faf1fce3d23f33f328b855646 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 5 Dec 2008 15:05:48 +0000 Subject: [PATCH] Fix a compilation problem with old dbus, Daniel --- ChangeLog | 5 +++++ configure.in | 1 + src/node_device_hal.c | 10 ++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ccc3d2490..4b366fe6c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Dec 5 16:03:53 CET 2008 Daniel Veillard + + * src/node_device_hal.c configure.in: fix a compilation problem + with old dbus versions + Thu Dec 5 10:10:41 GMT 2008 Daniel P. Berrange * src/domain_conf.c: Disable a few more functions for proxy diff --git a/configure.in b/configure.in index 70d730fd71..7f555cec01 100644 --- a/configure.in +++ b/configure.in @@ -1164,6 +1164,7 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then CFLAGS="$CFLAGS $HAL_CFLAGS" LDFLAGS="$LDFLAGS $HAL_LIBS" AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no]) + AC_CHECK_FUNCS([dbus_watch_get_unix_fd]) CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" fi diff --git a/src/node_device_hal.c b/src/node_device_hal.c index f7dba2f33a..f2bbbef19e 100644 --- a/src/node_device_hal.c +++ b/src/node_device_hal.c @@ -611,6 +611,7 @@ static dbus_bool_t add_dbus_watch(DBusWatch *watch, void *data ATTRIBUTE_UNUSED) { int flags = 0; + int fd; struct nodeDeviceWatchInfo *info; if (VIR_ALLOC(info) < 0) @@ -619,8 +620,13 @@ static dbus_bool_t add_dbus_watch(DBusWatch *watch, if (dbus_watch_get_enabled(watch)) flags = xlate_dbus_watch_flags(dbus_watch_get_flags(watch)); - info->watch = virEventAddHandle(dbus_watch_get_unix_fd(watch), flags, - dbus_watch_callback, watch, NULL); +#if HAVE_DBUS_WATCH_GET_UNIX_FD + fd = dbus_watch_get_unix_fd(watch); +#else + fd = dbus_watch_get_fd(watch); +#endif + info->watch = virEventAddHandle(fd, flags, dbus_watch_callback, + watch, NULL); if (info->watch < 0) { VIR_FREE(info); return 0; -- GitLab