ia64/xen-unstable

changeset 18479:fa2adc7fb996

x86, shadow: Fix some SHADOW_PRINTK() callers.
Signed-off-by: Yoshi Tamura <tamura.yoshiaki@lab.ntt.co.jp>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Sep 11 15:17:31 2008 +0100 (2008-09-11)
parents 01c8ccb551b0
children d8ce41b79ecc
files xen/arch/x86/mm/shadow/common.c xen/arch/x86/mm/shadow/multi.c
line diff
     1.1 --- a/xen/arch/x86/mm/shadow/common.c	Thu Sep 11 15:16:11 2008 +0100
     1.2 +++ b/xen/arch/x86/mm/shadow/common.c	Thu Sep 11 15:17:31 2008 +0100
     1.3 @@ -715,8 +715,8 @@ static void _sh_resync(struct vcpu *v, m
     1.4               & ~SHF_L1_ANY));
     1.5      ASSERT(!sh_page_has_multiple_shadows(mfn_to_page(gmfn)));
     1.6  
     1.7 -    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, va=%lx\n",
     1.8 -                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va);
     1.9 +    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n",
    1.10 +                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn));
    1.11  
    1.12      /* Need to pull write access so the page *stays* in sync. */
    1.13      if ( oos_remove_write_access(v, gmfn, fixup) )
    1.14 @@ -970,8 +970,8 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn
    1.15      
    1.16      ASSERT(shadow_locked_by_me(v->domain));
    1.17  
    1.18 -    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx va %lx\n",
    1.19 -                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va);
    1.20 +    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n",
    1.21 +                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn));
    1.22  
    1.23      pg = mfn_to_page(gmfn);
    1.24   
     2.1 --- a/xen/arch/x86/mm/shadow/multi.c	Thu Sep 11 15:16:11 2008 +0100
     2.2 +++ b/xen/arch/x86/mm/shadow/multi.c	Thu Sep 11 15:17:31 2008 +0100
     2.3 @@ -3179,7 +3179,7 @@ static int sh_page_fault(struct vcpu *v,
     2.4  
     2.5      SHADOW_PRINTK("d:v=%u:%u va=%#lx err=%u, rip=%lx\n",
     2.6                    v->domain->domain_id, v->vcpu_id, va, regs->error_code,
     2.7 -                  regs->rip);
     2.8 +                  regs->eip);
     2.9  
    2.10      perfc_incr(shadow_fault);
    2.11