ia64/xen-unstable

changeset 3879:d8180577bbb5

bitkeeper revision 1.1232 (421a1aeagsuhCOtCFLo9iXpcJUn-WA)

Minor renaming of "pfn"s to "mfn"s in various places.

Signed-off-by: michael.fetterman@cl.cam.ac.uk
author maf46@burn.cl.cam.ac.uk
date Mon Feb 21 17:31:22 2005 +0000 (2005-02-21)
parents 47fdecec47f5
children a42fd001d8f5
files xen/arch/x86/domain.c
line diff
     1.1 --- a/xen/arch/x86/domain.c	Mon Feb 21 17:27:21 2005 +0000
     1.2 +++ b/xen/arch/x86/domain.c	Mon Feb 21 17:31:22 2005 +0000
     1.3 @@ -298,18 +298,18 @@ void arch_vmx_do_launch(struct exec_doma
     1.4  
     1.5  static void alloc_monitor_pagetable(struct exec_domain *ed)
     1.6  {
     1.7 -    unsigned long mpfn;
     1.8 +    unsigned long mmfn;
     1.9      l2_pgentry_t *mpl2e, *phys_table;
    1.10 -    struct pfn_info *mpfn_info;
    1.11 +    struct pfn_info *mmfn_info;
    1.12      struct domain *d = ed->domain;
    1.13  
    1.14      ASSERT(!pagetable_val(ed->arch.monitor_table)); /* we should only get called once */
    1.15  
    1.16 -    mpfn_info = alloc_domheap_page(NULL);
    1.17 -    ASSERT( mpfn_info ); 
    1.18 +    mmfn_info = alloc_domheap_page(NULL);
    1.19 +    ASSERT( mmfn_info ); 
    1.20  
    1.21 -    mpfn = (unsigned long) (mpfn_info - frame_table);
    1.22 -    mpl2e = (l2_pgentry_t *) map_domain_mem(mpfn << PAGE_SHIFT);
    1.23 +    mmfn = (unsigned long) (mmfn_info - frame_table);
    1.24 +    mpl2e = (l2_pgentry_t *) map_domain_mem(mmfn << PAGE_SHIFT);
    1.25      memset(mpl2e, 0, PAGE_SIZE);
    1.26  
    1.27      memcpy(&mpl2e[DOMAIN_ENTRIES_PER_L2_PAGETABLE], 
    1.28 @@ -320,7 +320,7 @@ static void alloc_monitor_pagetable(stru
    1.29          mk_l2_pgentry((__pa(d->arch.mm_perdomain_pt) & PAGE_MASK) 
    1.30                        | __PAGE_HYPERVISOR);
    1.31  
    1.32 -    ed->arch.monitor_table = mk_pagetable(mpfn << PAGE_SHIFT);
    1.33 +    ed->arch.monitor_table = mk_pagetable(mmfn << PAGE_SHIFT);
    1.34      ed->arch.monitor_vtable = mpl2e;
    1.35  
    1.36      phys_table = (l2_pgentry_t *)
    1.37 @@ -337,26 +337,26 @@ static void alloc_monitor_pagetable(stru
    1.38  static void free_monitor_pagetable(struct exec_domain *ed)
    1.39  {
    1.40      l2_pgentry_t *mpl2e;
    1.41 -    unsigned long mpfn;
    1.42 +    unsigned long mfn;
    1.43  
    1.44      ASSERT( pagetable_val(ed->arch.monitor_table) );
    1.45      
    1.46      mpl2e = ed->arch.monitor_vtable;
    1.47  
    1.48      /*
    1.49 -     * First get the pfn for hl2_table by looking at monitor_table
    1.50 +     * First get the mfn for hl2_table by looking at monitor_table
    1.51       */
    1.52 -    mpfn = l2_pgentry_val(mpl2e[LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT])
    1.53 +    mfn = l2_pgentry_val(mpl2e[LINEAR_PT_VIRT_START >> L2_PAGETABLE_SHIFT])
    1.54          >> PAGE_SHIFT;
    1.55  
    1.56 -    free_domheap_page(&frame_table[mpfn]);
    1.57 +    free_domheap_page(&frame_table[mfn]);
    1.58      unmap_domain_mem(mpl2e);
    1.59  
    1.60      /*
    1.61       * Then free monitor_table.
    1.62       */
    1.63 -    mpfn = (pagetable_val(ed->arch.monitor_table)) >> PAGE_SHIFT;
    1.64 -    free_domheap_page(&frame_table[mpfn]);
    1.65 +    mfn = (pagetable_val(ed->arch.monitor_table)) >> PAGE_SHIFT;
    1.66 +    free_domheap_page(&frame_table[mfn]);
    1.67  
    1.68      ed->arch.monitor_table = mk_pagetable(0);
    1.69      ed->arch.monitor_vtable = 0;