direct-io.hg

changeset 8461:364128d29f4e

Clean up 'q' debug key output.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat Dec 31 14:33:00 2005 +0100 (2005-12-31)
parents d966b7a00959
children 121ff5042eb3 0fd894ba6ba0
files xen/arch/x86/domain.c xen/common/keyhandler.c xen/common/rangeset.c
line diff
     1.1 --- a/xen/arch/x86/domain.c	Sat Dec 31 14:15:22 2005 +0100
     1.2 +++ b/xen/arch/x86/domain.c	Sat Dec 31 14:33:00 2005 +0100
     1.3 @@ -184,11 +184,17 @@ void dump_pageframe_info(struct domain *
     1.4  {
     1.5      struct pfn_info *page;
     1.6  
     1.7 -    if ( d->tot_pages < 10 )
     1.8 +    printk("Memory pages belonging to domain %u:\n", d->domain_id);
     1.9 +
    1.10 +    if ( d->tot_pages >= 10 )
    1.11 +    {
    1.12 +        printk("    DomPage list too long to display\n");
    1.13 +    }
    1.14 +    else
    1.15      {
    1.16          list_for_each_entry ( page, &d->page_list, list )
    1.17          {
    1.18 -            printk("Page %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n",
    1.19 +            printk("    DomPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n",
    1.20                     _p(page_to_phys(page)), _p(page_to_pfn(page)),
    1.21                     page->count_info, page->u.inuse.type_info);
    1.22          }
    1.23 @@ -196,15 +202,10 @@ void dump_pageframe_info(struct domain *
    1.24  
    1.25      list_for_each_entry ( page, &d->xenpage_list, list )
    1.26      {
    1.27 -        printk("XenPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n",
    1.28 +        printk("    XenPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n",
    1.29                 _p(page_to_phys(page)), _p(page_to_pfn(page)),
    1.30                 page->count_info, page->u.inuse.type_info);
    1.31      }
    1.32 -
    1.33 -    page = virt_to_page(d->shared_info);
    1.34 -    printk("Shared_info@%p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n",
    1.35 -           _p(page_to_phys(page)), _p(page_to_pfn(page)), page->count_info,
    1.36 -           page->u.inuse.type_info);
    1.37  }
    1.38  
    1.39  struct vcpu *alloc_vcpu_struct(struct domain *d, unsigned int vcpu_id)
     2.1 --- a/xen/common/keyhandler.c	Sat Dec 31 14:15:22 2005 +0100
     2.2 +++ b/xen/common/keyhandler.c	Sat Dec 31 14:33:00 2005 +0100
     2.3 @@ -110,13 +110,11 @@ static void do_task_queues(unsigned char
     2.4  
     2.5      for_each_domain ( d )
     2.6      {
     2.7 -        printk("Xen: DOM %u, flags=%lx refcnt=%d nr_pages=%d "
     2.8 -               "xenheap_pages=%d\n", d->domain_id, d->domain_flags,
     2.9 -               atomic_read(&d->refcnt), d->tot_pages, d->xenheap_pages);
    2.10 -        /* The handle is printed according to the OSF DCE UUID spec., even
    2.11 -           though it is not necessarily such a thing, for ease of use when it
    2.12 -           _is_ one of those. */
    2.13 -        printk("     handle=%02x%02x%02x%02x-%02x%02x-%02x%02x-"
    2.14 +        printk("General information for domain %u:\n", d->domain_id);
    2.15 +        printk("    flags=%lx refcnt=%d nr_pages=%d xenheap_pages=%d\n",
    2.16 +               d->domain_flags, atomic_read(&d->refcnt),
    2.17 +               d->tot_pages, d->xenheap_pages);
    2.18 +        printk("    handle=%02x%02x%02x%02x-%02x%02x-%02x%02x-"
    2.19                 "%02x%02x-%02x%02x%02x%02x%02x%02x\n",
    2.20                 d->handle[ 0], d->handle[ 1], d->handle[ 2], d->handle[ 3],
    2.21                 d->handle[ 4], d->handle[ 5], d->handle[ 6], d->handle[ 7],
    2.22 @@ -127,16 +125,17 @@ static void do_task_queues(unsigned char
    2.23  
    2.24          dump_pageframe_info(d);
    2.25                 
    2.26 +        printk("VCPU information and callbacks for domain %u:\n",
    2.27 +               d->domain_id);
    2.28          for_each_vcpu ( d, v ) {
    2.29 -            printk("Guest: %p CPU %d [has=%c] flags=%lx "
    2.30 -                   "upcall_pend = %02x, upcall_mask = %02x\n", v,
    2.31 -                   v->processor,
    2.32 +            printk("    VCPU%d: CPU%d [has=%c] flags=%lx "
    2.33 +                   "upcall_pend = %02x, upcall_mask = %02x\n",
    2.34 +                   v->vcpu_id, v->processor,
    2.35                     test_bit(_VCPUF_running, &v->vcpu_flags) ? 'T':'F',
    2.36                     v->vcpu_flags,
    2.37                     v->vcpu_info->evtchn_upcall_pending, 
    2.38                     v->vcpu_info->evtchn_upcall_mask);
    2.39 -            printk("Notifying guest... %d/%d\n", d->domain_id, v->vcpu_id); 
    2.40 -            printk("port %d/%d stat %d %d %d\n",
    2.41 +            printk("    Notifying guest (virq %d, port %d, stat %d/%d/%d)\n",
    2.42                     VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG],
    2.43                     test_bit(v->virq_to_evtchn[VIRQ_DEBUG], 
    2.44                              &d->shared_info->evtchn_pending[0]),
     3.1 --- a/xen/common/rangeset.c	Sat Dec 31 14:15:22 2005 +0100
     3.2 +++ b/xen/common/rangeset.c	Sat Dec 31 14:33:00 2005 +0100
     3.3 @@ -381,7 +381,7 @@ void rangeset_domain_printk(
     3.4  {
     3.5      struct rangeset *r;
     3.6  
     3.7 -    printk("Rangesets belonging to domain %d:\n", d->domain_id);
     3.8 +    printk("Rangesets belonging to domain %u:\n", d->domain_id);
     3.9  
    3.10      spin_lock(&d->rangesets_lock);
    3.11