c/s 17565 build error on PAE system.

c/s 17565 build error on PAE system.

[Li, Haicheng]

Compiler: Gcc 4.1.1
Error Log:

make -f /xen_unstable_pae-17565-20080502/xen/Rules.mk -C shadow
built_in.o
make[6]: Entering directory
`/xen_unstable_pae-17565-20080502/xen/arch/x86/mm/shadow'
gcc -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing
-std=gnu99 -Wall -Wstrict-prototypes -Wno-unused-value
-Wdeclaration-after-statement -DNDEBUG -nostdinc -fno-builtin
-fno-common -iwithprefix include -Werror -Wno-pointer-arith -pipe
-I/xen_unstable_pae-17565-20080502/xen/include
-I/xen_unstable_pae-17565-20080502/xen/include/asm-x86/mach-generic
-I/xen_unstable_pae-17565-20080502/xen/include/asm-x86/mach-default
-msoft-float -fno-stack-protector -DCONFIG_X86_PAE=1 -g -D__XEN__ -c
common.c -o common.o
gcc -O2 -fomit-frame-pointer -m32 -march=i686 -fno-strict-aliasing
-std=gnu99 -Wall -Wstrict-prototypes -Wno-unused-value
-Wdeclaration-after-statement -DNDEBUG -nostdinc -fno-builtin
-fno-common -iwithprefix include -Werror -Wno-pointer-arith -pipe
-I/xen_unstable_pae-17565-20080502/xen/include
-I/xen_unstable_pae-17565-20080502/xen/include/asm-x86/mach-generic
-I/xen_unstable_pae-17565-20080502/xen/include/asm-x86/mach-default
-msoft-float -fno-stack-protector -DCONFIG_X86_PAE=1 -g -D__XEN__
-DGUEST_PAGING_LEVELS=2 -DSHADOW_PAGING_LEVELS=3 -c multi.c -o
g2_on_s3.o
cc1: warnings being treated as errors
multi.c: In function 'shadow_vram_get_l1e':
multi.c:1275: warning: cast from pointer to integer of different size
multi.c: In function 'shadow_vram_put_l1e':
multi.c:1298: warning: cast from pointer to integer of different size
make[6]: *** [g2_on_s3.o] Error 1
make[6]: Leaving directory
`/xen_unstable_pae-17565-20080502/xen/arch/x86/mm/shadow'
make[5]: *** [shadow/built_in.o] Error 2
make[5]: Leaving directory
`/xen_unstable_pae-17565-20080502/xen/arch/x86/mm'make[4]: ***
[mm/built_in.o] Error 2
make[4]: Leaving directory
`/xen_unstable_pae-17565-20080502/xen/arch/x86'
make[3]: *** [/xen_unstable_pae-17565-20080502/xen/arch/x86/built_in.o]
Error 2
make[3]: Leaving directory
`/xen_unstable_pae-17565-20080502/xen/arch/x86'
make[2]: *** [/xen_unstable_pae-17565-20080502/xen/xen] Error 2
make[2]: Leaving directory `/xen_unstable_pae-17565-20080502/xen'
make[1]: *** [install] Error 2
make[1]: Leaving directory `/xen_unstable_pae-17565-20080502/xen'
make: *** [install-xen] Error 2

-- haicheng

Re: c/s 17565 build error on PAE system.

[Samuel Thibault]

Hello,

Li, Haicheng, le Sun 04 May 2008 10:56:13 +0800, a écrit :
> multi.c: In function 'shadow_vram_get_l1e':
> multi.c:1275: warning: cast from pointer to integer of different size

Ergl, I thought I had checked the PAE compilation too, but apparently
not. Here is a patch.


Fix cast from pointer into physical offset.

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r b936b8ee02bb xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c	Fri May 02 17:06:53 2008 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c	Sun May 04 11:29:28 2008 +0100
@@ -1272,7 +1272,7 @@ static inline void shadow_vram_get_l1e(s
         if ( count_info == 1 )
             /* Initial guest reference, record it */
             d->dirty_vram->sl1ma[i] = pfn_to_paddr(mfn_x(sl1mfn))
-                | ((paddr_t) sl1e & ~PAGE_MASK);
+                | ((unsigned long) sl1e & ~PAGE_MASK);
     }
 }
 
@@ -1295,7 +1295,7 @@ static inline void shadow_vram_put_l1e(s
         u32 count_info = page->u.inuse.type_info & PGT_count_mask;
         int dirty = 0;
         paddr_t sl1ma =  pfn_to_paddr(mfn_x(sl1mfn))
-            | ((paddr_t) sl1e & ~PAGE_MASK);
+            | ((unsigned long) sl1e & ~PAGE_MASK);
 
         if ( count_info == 1 ) {
             /* Last reference */