[Xen-changelog] [xen-unstable] [XEN] Fix mapping of p2m into monitor tables for external-mode guests.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <tim.deegan@xxxxxxxxxxxxx>
# Node ID 5fa9b746d24fa2b427d9676cc5e27642bfd79137
# Parent  470666ea973d8bc279c38dfe0720588bf42e4136
[XEN] Fix mapping of p2m into monitor tables for external-mode guests.
The previous code could map frame zero into the P2M table on PAE hosts.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/shadow/multi.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff -r 470666ea973d -r 5fa9b746d24f xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c    Fri Sep 01 13:24:51 2006 -0700
+++ b/xen/arch/x86/mm/shadow/multi.c    Sat Sep 02 12:11:54 2006 +0100
@@ -1792,8 +1792,10 @@ void sh_install_xen_entries_in_l2h(struc
         for ( i = 0; i < MACHPHYS_MBYTES>>1; i++ )
         {
             sl2e[shadow_l2_table_offset(RO_MPT_VIRT_START) + i] =
-                shadow_l2e_from_mfn(_mfn(l3e_get_pfn(p2m[i])),
-                                    __PAGE_HYPERVISOR);
+                (l3e_get_flags(p2m[i]) & _PAGE_PRESENT)
+                ? shadow_l2e_from_mfn(_mfn(l3e_get_pfn(p2m[i])),
+                                      __PAGE_HYPERVISOR)
+                : shadow_l2e_empty();
         }
         sh_unmap_domain_page(p2m);
     }

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