direct-io.hg

changeset 10392:d5adbcbb7492

[IA64] use get_gpfn_from_mfn()

clean up vmx_vcpu_tpa() and mfn_to_gmfn(). don't access mpt_table directly.
use get_gpfn_from_mfn()

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Fri Jun 09 10:35:40 2006 -0600 (2006-06-09)
parents 2f9878d01e2b
children 6fdafeeb88bb
files xen/arch/ia64/vmx/vmmu.c xen/include/asm-ia64/mm.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmmu.c	Fri Jun 09 10:35:39 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmmu.c	Fri Jun 09 10:35:40 2006 -0600
     1.3 @@ -637,7 +637,7 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT6
     1.4              dnat_page_consumption(vcpu, vadr);
     1.5              return IA64_FAULT;
     1.6          }else{
     1.7 -            *padr = ((*(mpt_table+arch_to_xen_ppn(data->ppn)))<<PAGE_SHIFT) | (vadr&(PAGE_SIZE-1));
     1.8 +            *padr = (get_gpfn_from_mfn(arch_to_xen_ppn(data->ppn)) << PAGE_SHIFT) | (vadr & (PAGE_SIZE - 1));
     1.9              return IA64_NO_FAULT;
    1.10          }
    1.11      }
     2.1 --- a/xen/include/asm-ia64/mm.h	Fri Jun 09 10:35:39 2006 -0600
     2.2 +++ b/xen/include/asm-ia64/mm.h	Fri Jun 09 10:35:40 2006 -0600
     2.3 @@ -460,7 +460,7 @@ extern u64 translate_domain_pte(u64 ptev
     2.4  */
     2.5  
     2.6  #define mfn_to_gmfn(_d, mfn)			\
     2.7 -    machine_to_phys_mapping[(mfn)]
     2.8 +    get_gpfn_from_mfn(mfn)
     2.9  
    2.10  #define gmfn_to_mfn(_d, gpfn)			\
    2.11      gmfn_to_mfn_foreign((_d), (gpfn))