[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>

diff --git a/xen/arch/ia64/vmx/vmmu.c b/xen/arch/ia64/vmx/vmmu.c
index 49b289707cd71e9dda80662cc5a521cbc5b3f15f..84db1441a1dc21bedebe99e041599d3a1e39d371 100644 (file)
--- a/xen/arch/ia64/vmx/vmmu.c
+++ b/xen/arch/ia64/vmx/vmmu.c
@@ -637,7 +637,7 @@ IA64FAULT vmx_vcpu_tpa(VCPU *vcpu, UINT64 vadr, UINT64 *padr)
             dnat_page_consumption(vcpu, vadr);
             return IA64_FAULT;
         }else{
-            *padr = ((*(mpt_table+arch_to_xen_ppn(data->ppn)))<<PAGE_SHIFT) | (vadr&(PAGE_SIZE-1));
+            *padr = (get_gpfn_from_mfn(arch_to_xen_ppn(data->ppn)) << PAGE_SHIFT) | (vadr & (PAGE_SIZE - 1));
             return IA64_NO_FAULT;
         }
     }

diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h
index 2521b5c1446a85bd4e5d14cf5eda0e82636440d9..a2840792445b26c7ec8b840f69f1469fc91b6f6e 100644 (file)
--- a/xen/include/asm-ia64/mm.h
+++ b/xen/include/asm-ia64/mm.h
@@ -460,7 +460,7 @@ extern u64 translate_domain_pte(u64 pteval, u64 address, u64 itir__, u64* logps)
 */
 
 #define mfn_to_gmfn(_d, mfn)                   \
-    machine_to_phys_mapping[(mfn)]
+    get_gpfn_from_mfn(mfn)
 
 #define gmfn_to_mfn(_d, gpfn)                  \
     gmfn_to_mfn_foreign((_d), (gpfn))