direct-io.hg

changeset 7552:c7006e46cd06

Small shadow pagetable fixes.

Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Xin B Li <xin.b.li@intel.com>
author kaf24@firebug.cl.cam.ac.uk
date Sun Oct 30 16:40:05 2005 +0100 (2005-10-30)
parents 47ba7a4bed45
children 8e1bfcb901e5
files xen/arch/x86/shadow.c xen/include/asm-x86/shadow.h
line diff
     1.1 --- a/xen/arch/x86/shadow.c	Sun Oct 30 15:42:02 2005 +0100
     1.2 +++ b/xen/arch/x86/shadow.c	Sun Oct 30 16:40:05 2005 +0100
     1.3 @@ -1381,7 +1381,8 @@ static int resync_all(struct domain *d, 
     1.4              perfc_incrc(resync_l1);
     1.5              perfc_incr_histo(wpt_updates, changed, PT_UPDATES);
     1.6              perfc_incr_histo(l1_entries_checked, max_shadow - min_shadow + 1, PT_UPDATES);
     1.7 -            if (unshadow_l1) {
     1.8 +            if ( d->arch.ops->guest_paging_levels == PAGING_L4 &&
     1.9 +                 unshadow_l1 ) {
    1.10                  pgentry_64_t l2e;
    1.11  
    1.12                  __shadow_get_l2e(entry->v, entry->va, &l2e);
     2.1 --- a/xen/include/asm-x86/shadow.h	Sun Oct 30 15:42:02 2005 +0100
     2.2 +++ b/xen/include/asm-x86/shadow.h	Sun Oct 30 16:40:05 2005 +0100
     2.3 @@ -387,7 +387,7 @@ shadow_get_page_from_l1e(l1_pgentry_t l1
     2.4      nl1e = l1e;
     2.5      l1e_remove_flags(nl1e, _PAGE_GLOBAL);
     2.6  
     2.7 -    if ( unlikely(l1e_get_flags(l1e) & L1_DISALLOW_MASK) )
     2.8 +    if ( unlikely(l1e_get_flags(nl1e) & L1_DISALLOW_MASK) )
     2.9          return 0;
    2.10  
    2.11      res = get_page_from_l1e(nl1e, d);