ia64/xen-unstable

changeset 3932:e93d8f53eabb

bitkeeper revision 1.1236.1.26 (421f5b13Cz9lSP0vaODNui9rk6qlfw)

More shadow cleanup.

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author maf46@burn.cl.cam.ac.uk
date Fri Feb 25 17:06:27 2005 +0000 (2005-02-25)
parents 4f299b15052c
children a5931595eca4 3c5d6f364349 d4b85d775de2
files xen/arch/x86/shadow.c xen/arch/x86/vmx_vmcs.c
line diff
     1.1 --- a/xen/arch/x86/shadow.c	Fri Feb 25 16:07:27 2005 +0000
     1.2 +++ b/xen/arch/x86/shadow.c	Fri Feb 25 17:06:27 2005 +0000
     1.3 @@ -798,14 +798,6 @@ unsigned long mk_hl2_table(struct exec_d
     1.4      memset(hl2, 0, PAGE_SIZE);
     1.5      unmap_domain_mem(hl2);
     1.6  
     1.7 -    // install this hl2 as the linear_pg_table
     1.8 -    if ( shadow_mode_external(d) )
     1.9 -        ed->arch.monitor_vtable[l2_table_offset(LINEAR_PT_VIRT_START)] =
    1.10 -            mk_l2_pgentry((hl2mfn << PAGE_SHIFT) | __PAGE_HYPERVISOR);
    1.11 -    else
    1.12 -        ed->arch.shadow_vtable[l2_table_offset(LINEAR_PT_VIRT_START)] =
    1.13 -            mk_l2_pgentry((hl2mfn << PAGE_SHIFT) | __PAGE_HYPERVISOR);
    1.14 -
    1.15      return status;
    1.16  }
    1.17  
     2.1 --- a/xen/arch/x86/vmx_vmcs.c	Fri Feb 25 16:07:27 2005 +0000
     2.2 +++ b/xen/arch/x86/vmx_vmcs.c	Fri Feb 25 17:06:27 2005 +0000
     2.3 @@ -161,7 +161,6 @@ void vmx_do_launch(struct exec_domain *e
     2.4      struct host_execution_env host_env;
     2.5      struct Xgt_desc_struct desc;
     2.6      struct list_head *list_ent;
     2.7 -    l2_pgentry_t *mpl2e, *hl2_vtable;
     2.8      unsigned long i, pfn = 0;
     2.9      struct pfn_info *page;
    2.10      execution_context_t *ec = get_execution_context();
    2.11 @@ -173,8 +172,6 @@ void vmx_do_launch(struct exec_domain *e
    2.12      spin_lock(&d->page_alloc_lock);
    2.13      list_ent = d->page_list.next;
    2.14  
    2.15 -    mpl2e = (l2_pgentry_t *)map_domain_mem(pagetable_val(ed->arch.monitor_table));
    2.16 -
    2.17      for ( i = 0; list_ent != &d->page_list; i++ )
    2.18      {
    2.19          pfn = list_entry(list_ent, struct pfn_info, list) - frame_table;
    2.20 @@ -188,18 +185,6 @@ void vmx_do_launch(struct exec_domain *e
    2.21      page = (struct pfn_info *) alloc_domheap_page(NULL);
    2.22      pfn = (unsigned long) (page - frame_table);
    2.23  
    2.24 -    /*
    2.25 -     * make linear_pt_table work for guest ptes
    2.26 -     */
    2.27 -    mpl2e[LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT] =
    2.28 -        mk_l2_pgentry((pfn << PAGE_SHIFT)| __PAGE_HYPERVISOR);
    2.29 -
    2.30 -    hl2_vtable = map_domain_mem(pfn << PAGE_SHIFT);
    2.31 -    memset(hl2_vtable, 0, PAGE_SIZE); /* clean it up */
    2.32 -    ed->arch.hl2_vtable = hl2_vtable; 
    2.33 -        
    2.34 -    unmap_domain_mem(mpl2e);
    2.35 -
    2.36      vmx_setup_platform(ed, ec);
    2.37  
    2.38      __asm__ __volatile__ ("sgdt  (%%eax) \n" :: "a"(&desc) : "memory");