Re: [PATCH] Fix arguments passed to SHADOW_PRINTK

[Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>]

Gianluca,

Thanks for your comment.
The following is the fixed patch.

Thanks,

Yoshi

Signed-off-by: Yoshi Tamura <tamura.yoshiaki@lab.ntt.co.jp>

diff -r bfd1157dd315 xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c	Thu Sep 11 08:06:48 2008 +0900
+++ b/xen/arch/x86/mm/shadow/common.c	Thu Sep 11 11:42:40 2008 +0900
@@ -700,8 +700,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) )
@@ -952,8 +952,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 bfd1157dd315 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c	Thu Sep 11 08:06:48 2008 +0900
+++ b/xen/arch/x86/mm/shadow/multi.c	Thu Sep 11 11:46:48 2008 +0900
@@ -3041,9 +3041,9 @@ static int sh_page_fault(struct vcpu *v,
      int fast_emul = 0;
  #endif

-    SHADOW_PRINTK("d:v=%u:%u va=%#lx err=%u, rip=%lx\n",
+    SHADOW_PRINTK("d:v=%u:%u va=%#lx err=%u, eip=%lx\n",
                    v->domain->domain_id, v->vcpu_id, va, regs->error_code,
-                  regs->rip);
+                  regs->eip);

      perfc_incr(shadow_fault);


Gianluca Guida wrote:
> 
> 
> Yoshiaki Tamura wrote:
>> Keir and Gianluca,
>>
>> When I compiled xen-3.3-testing with DEBUG_TRACE_DUMP turned on,
>> I got the following errors. Would you please tell me how to work around?
>>
>> multi.c: In function 'sh_page_fault__guest_2':
>> multi.c:3045: error: 'struct cpu_user_regs' has no member named 'rip'
> 
> Using regs->eip should work both on 32 and 64 bit.
> 
> Thanks,
> Gianluca
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xensource.com
> http://lists.xensource.com/xen-devel
> 
> 
> 


-- 
TAMURA, Yoshiaki

NTT Cyber Space Labs
OSS Computing Project
Kernel Group
E-mail: tamura.yoshiaki@lab.ntt.co.jp
TEL: +81-46-859-2771
FAX: +81-46-855-1152
Address: 1-1 Hikarinooka, Yokosuka
	 Kanagawa 239-0847 JAPAN