[Xen-changelog] [xen-unstable] x86, shadow: Fix some SHADOW_PRINTK() callers.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1221142651 -3600
# Node ID fa2adc7fb996a1d2589e6d81c2eabbd6e115cc03
# Parent  01c8ccb551b0d4f860a4e78237de9b70baed48ba
x86, shadow: Fix some SHADOW_PRINTK() callers.
Signed-off-by: Yoshi Tamura <tamura.yoshiaki@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/common.c |    8 ++++----
 xen/arch/x86/mm/shadow/multi.c  |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -r 01c8ccb551b0 -r fa2adc7fb996 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c   Thu Sep 11 15:16:11 2008 +0100
+++ b/xen/arch/x86/mm/shadow/common.c   Thu Sep 11 15:17:31 2008 +0100
@@ -715,8 +715,8 @@ static void _sh_resync(struct vcpu *v, m
              & ~SHF_L1_ANY));
     ASSERT(!sh_page_has_multiple_shadows(mfn_to_page(gmfn)));
 
-    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx, va=%lx\n",
-                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va);
+    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n",
+                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn));
 
     /* Need to pull write access so the page *stays* in sync. */
     if ( oos_remove_write_access(v, gmfn, fixup) )
@@ -970,8 +970,8 @@ int sh_unsync(struct vcpu *v, mfn_t gmfn
     
     ASSERT(shadow_locked_by_me(v->domain));
 
-    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx va %lx\n",
-                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn), va);
+    SHADOW_PRINTK("d=%d, v=%d, gmfn=%05lx\n",
+                  v->domain->domain_id, v->vcpu_id, mfn_x(gmfn));
 
     pg = mfn_to_page(gmfn);
  
diff -r 01c8ccb551b0 -r fa2adc7fb996 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Thu Sep 11 15:16:11 2008 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c    Thu Sep 11 15:17:31 2008 +0100
@@ -3179,7 +3179,7 @@ static int sh_page_fault(struct vcpu *v,
 
     SHADOW_PRINTK("d:v=%u:%u va=%#lx err=%u, rip=%lx\n",
                   v->domain->domain_id, v->vcpu_id, va, regs->error_code,
-                  regs->rip);
+                  regs->eip);
 
     perfc_incr(shadow_fault);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog