ia64/xen-unstable

changeset 8096:48aaa39eaa7e

minor printf and log message rework in the shadow code.
author Michael.Fetterman@cl.cam.ac.uk
date Mon Nov 28 15:12:39 2005 +0100 (2005-11-28)
parents 9971d8d1f631
children 7363637e2721
files xen/arch/x86/shadow.c xen/arch/x86/shadow32.c xen/arch/x86/shadow_public.c
line diff
     1.1 --- a/xen/arch/x86/shadow.c	Mon Nov 28 15:09:44 2005 +0100
     1.2 +++ b/xen/arch/x86/shadow.c	Mon Nov 28 15:12:39 2005 +0100
     1.3 @@ -1075,8 +1075,8 @@ static void shadow_mark_va_out_of_sync(
     1.4      entry->next = d->arch.out_of_sync;
     1.5      d->arch.out_of_sync = entry;
     1.6  
     1.7 -    FSH_LOG("mark_out_of_sync(va=%lx -> writable_pl1e=%lx)",
     1.8 -            va, entry->writable_pl1e);
     1.9 +    FSH_LOG("%s(va=%lx -> writable_pl1e=%lx)",
    1.10 +            __func__, va, entry->writable_pl1e);
    1.11  }
    1.12  
    1.13  /*
     2.1 --- a/xen/arch/x86/shadow32.c	Mon Nov 28 15:09:44 2005 +0100
     2.2 +++ b/xen/arch/x86/shadow32.c	Mon Nov 28 15:12:39 2005 +0100
     2.3 @@ -1440,8 +1440,8 @@ get_mfn_from_pfn_foreign(struct domain *
     2.4      unmap_domain_page(l2);
     2.5      if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
     2.6      {
     2.7 -        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => 0 l2e=%" PRIpte "\n",
     2.8 -               d->domain_id, gpfn, l2e_get_intpte(l2e));
     2.9 +        printk("%s(d->id=%d, gpfn=%lx) => 0 l2e=%" PRIpte "\n",
    2.10 +               __func__, d->domain_id, gpfn, l2e_get_intpte(l2e));
    2.11          return INVALID_MFN;
    2.12      }
    2.13      l1 = map_domain_page(l2e_get_pfn(l2e));
    2.14 @@ -1449,14 +1449,14 @@ get_mfn_from_pfn_foreign(struct domain *
    2.15      unmap_domain_page(l1);
    2.16  
    2.17  #if 0
    2.18 -    printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => %lx tabpfn=%lx l2e=%lx l1tab=%lx, l1e=%lx\n",
    2.19 -           d->domain_id, gpfn, l1_pgentry_val(l1e) >> PAGE_SHIFT, tabpfn, l2e, l1tab, l1e);
    2.20 +    printk("%s(d->id=%d, gpfn=%lx) => %lx tabpfn=%lx l2e=%lx l1tab=%lx, l1e=%lx\n",
    2.21 +           __func__, d->domain_id, gpfn, l1_pgentry_val(l1e) >> PAGE_SHIFT, tabpfn, l2e, l1tab, l1e);
    2.22  #endif
    2.23  
    2.24      if ( !(l1e_get_flags(l1e) & _PAGE_PRESENT) )
    2.25      {
    2.26 -        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => 0 l1e=%" PRIpte "\n",
    2.27 -               d->domain_id, gpfn, l1e_get_intpte(l1e));
    2.28 +        printk("%s(d->id=%d, gpfn=%lx) => 0 l1e=%" PRIpte "\n",
    2.29 +               __func__, d->domain_id, gpfn, l1e_get_intpte(l1e));
    2.30          return INVALID_MFN;
    2.31      }
    2.32  
    2.33 @@ -1945,8 +1945,8 @@ void shadow_mark_va_out_of_sync(
    2.34      entry->next = d->arch.out_of_sync;
    2.35      d->arch.out_of_sync = entry;
    2.36  
    2.37 -    FSH_LOG("mark_out_of_sync(va=%lx -> writable_pl1e=%lx)",
    2.38 -            va, entry->writable_pl1e);
    2.39 +    FSH_LOG("%s(va=%lx -> writable_pl1e=%lx)",
    2.40 +            __func__, va, entry->writable_pl1e);
    2.41  }
    2.42  
    2.43  /*
     3.1 --- a/xen/arch/x86/shadow_public.c	Mon Nov 28 15:09:44 2005 +0100
     3.2 +++ b/xen/arch/x86/shadow_public.c	Mon Nov 28 15:12:39 2005 +0100
     3.3 @@ -1624,8 +1624,8 @@ get_mfn_from_pfn_foreign(struct domain *
     3.4      unmap_domain_page(l2);
     3.5      if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) )
     3.6      {
     3.7 -        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => 0 l2e=%" PRIpte "\n",
     3.8 -               d->domain_id, gpfn, l2e_get_intpte(l2e));
     3.9 +        printk("%s(d->id=%d, gpfn=%lx) => 0 l2e=%" PRIpte "\n",
    3.10 +               __func__, d->domain_id, gpfn, l2e_get_intpte(l2e));
    3.11          return INVALID_MFN;
    3.12      }
    3.13      l1 = map_domain_page(l2e_get_pfn(l2e));
    3.14 @@ -1633,14 +1633,14 @@ get_mfn_from_pfn_foreign(struct domain *
    3.15      unmap_domain_page(l1);
    3.16  
    3.17  #if 0
    3.18 -    printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => %lx tabpfn=%lx l2e=%lx l1tab=%lx, l1e=%lx\n",
    3.19 -           d->domain_id, gpfn, l1_pgentry_val(l1e) >> PAGE_SHIFT, tabpfn, l2e, l1tab, l1e);
    3.20 +    printk("%s(d->id=%d, gpfn=%lx) => %lx tabpfn=%lx l2e=%lx l1tab=%lx, l1e=%lx\n",
    3.21 +           __func__, d->domain_id, gpfn, l1_pgentry_val(l1e) >> PAGE_SHIFT, tabpfn, l2e, l1tab, l1e);
    3.22  #endif
    3.23  
    3.24      if ( !(l1e_get_flags(l1e) & _PAGE_PRESENT) )
    3.25      {
    3.26 -        printk("gpfn_to_mfn_foreign(d->id=%d, gpfn=%lx) => 0 l1e=%" PRIpte "\n",
    3.27 -               d->domain_id, gpfn, l1e_get_intpte(l1e));
    3.28 +        printk("%s(d->id=%d, gpfn=%lx) => 0 l1e=%" PRIpte "\n",
    3.29 +               __func__, d->domain_id, gpfn, l1e_get_intpte(l1e));
    3.30          return INVALID_MFN;
    3.31      }
    3.32