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

[Samuel Thibault <samuel.thibault@eu.citrix.com>]

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 */