1.1 --- a/xen/arch/x86/domain.c	Sun Feb 13 20:31:57 2005 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Sun Feb 13 22:00:50 2005 +0000
     1.3 @@ -299,7 +299,7 @@ static void alloc_monitor_pagetable(stru
     1.4      struct pfn_info *mpfn_info;
     1.5      struct domain *d = ed->domain;
     1.6  
     1.7 -    ASSERT(!ed->arch.monitor_table); /* we should only get called once */
     1.8 +    ASSERT(!pagetable_val(ed->arch.monitor_table)); /* we should only get called once */
     1.9  
    1.10      mpfn_info = alloc_domheap_page(NULL);
    1.11      ASSERT( mpfn_info ); 
    1.12 @@ -502,8 +502,11 @@ int arch_final_setup_guest(
    1.13          return vmx_final_setup_guest(d, c);
    1.14  #endif
    1.15  
    1.16 -    update_pagetables(d);  /* this assigns shadow_pagetable 
    1.17 -                                and monitor_table */
    1.18 +    /* We don't call update_pagetables() as we actively want fields such as 
    1.19 +     * the linear_pg_table to be null so that we bail out early of 
    1.20 +     * shadow_fault in case the vmx guest tries illegal accesses with
    1.21 +     * paging turned of. 
    1.22 +     */
    1.23  
    1.24      return 0;
    1.25  }

     2.1 --- a/xen/arch/x86/x86_32/domain_build.c	Sun Feb 13 20:31:57 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_32/domain_build.c	Sun Feb 13 22:00:50 2005 +0000
     2.3 @@ -385,7 +385,7 @@ int construct_dom0(struct domain *d,
     2.4      if (0) /* XXXXX DO NOT CHECK IN ENABLED !!! (but useful for testing so leave) */
     2.5      {
     2.6          shadow_mode_enable(d, SHM_test); 
     2.7 -        update_pagetable(ed); /* XXX SMP */
     2.8 +        update_pagetables(ed); /* XXX SMP */
     2.9      }
    2.10  #endif
    2.11