External/libvirt
1
0
Fork 0
Code

Work around 'virGetVersion' build problem

Browse Source 
The 'getVer' fix introducted in d88d459d [Allow remote://hostname/
style URIs for automatic driver probe...] breaks compiling libvirt
with loadable module support.  Work around this to get it building again.

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
This commit is contained in:
Jim Meyering 2009-02-17 10:33:41 +00:00
parent cedc15019e
commit 64b72210ad
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Feb 17 11:30:23 +0100 2009 Maximilian Wilhelm <max@rfc2324.org>
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 <meyering@redhat.com> Tue Feb 17 11:25:22 +0100 2009 Jim Meyering <meyering@redhat.com>
avoid compiler warning about unused parameter avoid compiler warning about unused parameter

7
src/libvirt.c
View File

@ -803,7 +803,13 @@ virGetVersion(unsigned long *libVer, const char *type,
if (typeVer != NULL) { if (typeVer != NULL) {
if (type == NULL) if (type == NULL)
type = "Xen"; type = "Xen";
/* FIXME: Add _proper_ type version handling for loadable driver modules... */
#ifdef WITH_DRIVER_MODULES
*typeVer = LIBVIR_VERSION_NUMBER;
#else
*typeVer = 0; *typeVer = 0;
#if WITH_XEN #if WITH_XEN
if (STRCASEEQ(type, "Xen")) if (STRCASEEQ(type, "Xen"))
*typeVer = xenUnifiedVersion(); *typeVer = xenUnifiedVersion();
@ -836,6 +842,7 @@ virGetVersion(unsigned long *libVer, const char *type,
virLibConnError(NULL, VIR_ERR_NO_SUPPORT, type); virLibConnError(NULL, VIR_ERR_NO_SUPPORT, type);
return (-1); return (-1);
} }
#endif /* WITH_DRIVER_MODULES */
} }
return (0); return (0);
} }