Re: another kvm-70 compile bug with rhel/centos 5.2

[Avi Kivity <avi@qumranet.com>]

[-- Attachment #1: Type: text/plain, Size: 840 bytes --]

Farkas Levente wrote:
> Avi Kivity wrote:
>> Farkas Levente wrote:
>>> hi,
>>> i'm just try to recompile kvm-70 with the latest centos-5.2 (aka
>>> rhel-5.2) kernel, but i've got a new compile error:
>>
>>> error: redefinition of typedef 'bool'
>>
>> Please try the attached patch, and let me know if it helps.
>>
>
> FYI:
> /lib/modules/2.6.18-92.1.6.el5/build/include/linux/version.h:
> -------------------------------
> #define LINUX_VERSION_CODE 132626
> #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
> #define RHEL_MAJOR 5
> #define RHEL_MINOR 2
> #define RHEL_RELEASE_CODE 1282
> #define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))
> -------------------------------
>

Ah, swapped _CODE and _VERSION.  Updated patch attached.


-- 
Do not meddle in the internals of kernels, for they are subtle and quick to panic.


[-- Attachment #2: rhel-5.2.patch --]
[-- Type: text/x-patch, Size: 494 bytes --]

diff --git a/kernel/external-module-compat.h b/kernel/external-module-compat.h
index c28d759..1ad515f 100644
--- a/kernel/external-module-compat.h
+++ b/kernel/external-module-compat.h
@@ -349,10 +349,14 @@ uint64_t div64_u64(uint64_t dividend, uint64_t divisor);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 
+#if !defined(RHEL_RELEASE_CODE) || (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,2))
+
 typedef _Bool bool;
 
 #endif
 
+#endif
+
 /*
  * PF_VCPU is a Linux 2.6.24 addition
  */