diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-07-02 19:18:37 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-07-02 19:18:37 +0100 |
| commit | abb57cc4236eb7e707608787167e4748a2265264 (patch) | |
| tree | 3ba2fcab680f7ac4fe8a7728b041e5ee32ab98c3 | |
| parent | 0e1550a55a8592d986c45b28ddf50814e2d1f69b (diff) | |
| download | xen-abb57cc4236eb7e707608787167e4748a2265264.tar.gz xen-abb57cc4236eb7e707608787167e4748a2265264.tar.bz2 xen-abb57cc4236eb7e707608787167e4748a2265264.zip | |
x86 shadow: Fix x86_32 build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset: 21649:74fa38447ad9
xen-unstable date: Tue Jun 22 07:19:16 2010 +0100
| -rw-r--r-- | xen/arch/x86/mm/shadow/multi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 7e713f5f18..eaeda7106c 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -4671,7 +4671,7 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) paddr_t gcr3 = 0; mfn_t smfn, gmfn; p2m_type_t p2mt; - unsigned long gl3pa; + char *gl3pa = NULL; guest_l3e_t *gl3e = NULL; paddr_t gl2a = 0; @@ -4685,13 +4685,14 @@ static void sh_pagetable_dying(struct vcpu *v, paddr_t gpa) gmfn = gfn_to_mfn_query(v->domain, _gfn(gpa >> PAGE_SHIFT), &p2mt); if ( !mfn_valid(gmfn) || !p2m_is_ram(p2mt) ) { - printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %lx\n", gpa); + printk(XENLOG_DEBUG "sh_pagetable_dying: gpa not valid %"PRIpaddr"\n", + gpa); goto out; } if ( !fast_path ) { - gl3pa = (unsigned long) sh_map_domain_page(gmfn); - gl3e = (guest_l3e_t *) (gl3pa + (gpa & ~PAGE_MASK)); + gl3pa = sh_map_domain_page(gmfn); + gl3e = (guest_l3e_t *)(gl3pa + ((unsigned long)gpa & ~PAGE_MASK)); } for ( i = 0; i < 4; i++ ) { |