[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1299178329 0
# Node ID 6241fa0ad1a939d2eba11bdec929564276f56a9e
# Parent  3db8805c4995dd9944afde9c68c1788227a3d33f
# Parent  de49500f344adb3b8fa240ec1d43bedc7f216ce5
Merge
---


diff -r 3db8805c4995 -r 6241fa0ad1a9 tools/include/xen-foreign/structs.py
--- a/tools/include/xen-foreign/structs.py      Thu Mar 03 18:51:13 2011 +0000
+++ b/tools/include/xen-foreign/structs.py      Thu Mar 03 18:52:09 2011 +0000
@@ -53,6 +53,7 @@
 
             # all archs
             "xen_pfn_to_cr3",
+            "xen_cr3_to_pfn",
             "XEN_LEGACY_MAX_VCPUS",
             "MAX_GUEST_CMDLINE" ];
 
diff -r 3db8805c4995 -r 6241fa0ad1a9 tools/libxc/xc_pagetab.c
--- a/tools/libxc/xc_pagetab.c  Thu Mar 03 18:51:13 2011 +0000
+++ b/tools/libxc/xc_pagetab.c  Thu Mar 03 18:52:09 2011 +0000
@@ -61,11 +61,12 @@
             return 0;
         if (domctl.u.address_size.size == 64) {
             pt_levels = 4;
-            paddr = ctx.x64.ctrlreg[3] & ~0xfffull;
+            paddr = (uint64_t)xen_cr3_to_pfn_x86_64(ctx.x64.ctrlreg[3])
+                << PAGE_SHIFT;
         } else {
             pt_levels = 3;
-            paddr = (((uint64_t) xen_cr3_to_pfn(ctx.x32.ctrlreg[3])) 
-                     << PAGE_SHIFT);
+            paddr = (uint64_t)xen_cr3_to_pfn_x86_32(ctx.x32.ctrlreg[3])
+                << PAGE_SHIFT;
         }
     }
 

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