From: Keir Fraser <keir.fraser@citrix.com>
Date: Thu, 6 Dec 2007 11:29:18 +0000 (+0000)
Subject: xc ptrace: Fix a couple of bugs in page-table walking.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14655
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c8a9164ee55b0fb67dcd1241345c914b1ffb3789;p=xen.git

xc ptrace: Fix a couple of bugs in page-table walking.
Signed-off-by: John Zulauf <john.zulauf@intel.com>
---

diff --git a/tools/libxc/xc_ptrace.c b/tools/libxc/xc_ptrace.c
index cdccd4da90..f3cf2d79d8 100644
--- a/tools/libxc/xc_ptrace.c
+++ b/tools/libxc/xc_ptrace.c
@@ -156,21 +156,8 @@ online_vcpus_changed(uint64_t cpumap)
 static long      nr_pages = 0;
 static uint64_t *page_array = NULL;
 
-
-/*
- * Translates physical addresses to machine addresses for HVM
- * guests. For paravirtual domains the function will just return the
- * given address.
- *
- * This function should be used when reading page directories/page
- * tables.
- *
- */
-static uint64_t
-to_ma(int cpu, uint64_t maddr)
+static uint64_t to_ma(int cpu, uint64_t maddr)
 {
-    if ( current_is_hvm && paging_enabled(&ctxt[cpu]) )
-        maddr = page_array[maddr >> PAGE_SHIFT] << PAGE_SHIFT;
     return maddr;
 }
 
@@ -310,7 +297,7 @@ map_domain_va_64(
         return NULL;
     l1p = to_ma(cpu, l2e);
     if (l2e & 0x80)  { /* 2M pages */
-        p = to_ma(cpu, (l1p + l1_table_offset(va)) << PAGE_SHIFT);
+        p = to_ma(cpu, l1p + (l1_table_offset(va) << PAGE_SHIFT));
     } else { /* 4K pages */
         l1 = xc_map_foreign_range(xc_handle, current_domid, PAGE_SIZE, PROT_READ, l1p >> PAGE_SHIFT);
         if ( l1 == NULL )