diff --git a/ChangeLog b/ChangeLog index eb7902398a..967e5c9851 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 17 11:30:23 +0100 2009 Maximilian Wilhelm + + Work around 'virGetVersion' build problem + The 'getVer' fix introducted in 02a72b42 [Allow remote://hostname/ + style URIs for automatic driver probe...] breaks compiling libvirt + with loadable module support. Work around this to get it building again. + Tue Feb 17 11:25:22 +0100 2009 Jim Meyering avoid compiler warning about unused parameter diff --git a/src/libvirt.c b/src/libvirt.c index ae076d1087..038a1ac4cf 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -803,7 +803,13 @@ virGetVersion(unsigned long *libVer, const char *type, if (typeVer != NULL) { if (type == NULL) type = "Xen"; + +/* FIXME: Add _proper_ type version handling for loadable driver modules... */ +#ifdef WITH_DRIVER_MODULES + *typeVer = LIBVIR_VERSION_NUMBER; +#else *typeVer = 0; + #if WITH_XEN if (STRCASEEQ(type, "Xen")) *typeVer = xenUnifiedVersion(); @@ -836,6 +842,7 @@ virGetVersion(unsigned long *libVer, const char *type, virLibConnError(NULL, VIR_ERR_NO_SUPPORT, type); return (-1); } +#endif /* WITH_DRIVER_MODULES */ } return (0); }