diff options
author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-12-31 14:33:00 +0100 |
---|---|---|
committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-12-31 14:33:00 +0100 |
commit | 24b0fec3cf6661ee1ef82a5dffed48ec987ea95b (patch) | |
tree | 7faeeb6549dbcef67b621bb078d84bf69738554b | |
parent | 7e127cd35f6fd48eff4b9f8958eef8fac2b846aa (diff) | |
download | xen-24b0fec3cf6661ee1ef82a5dffed48ec987ea95b.tar.gz xen-24b0fec3cf6661ee1ef82a5dffed48ec987ea95b.tar.bz2 xen-24b0fec3cf6661ee1ef82a5dffed48ec987ea95b.zip |
Clean up 'q' debug key output.
Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r-- | xen/arch/x86/domain.c | 17 | ||||
-rw-r--r-- | xen/common/keyhandler.c | 23 | ||||
-rw-r--r-- | xen/common/rangeset.c | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 49603696c5..d905f9dfbf 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -184,11 +184,17 @@ void dump_pageframe_info(struct domain *d) { struct pfn_info *page; - if ( d->tot_pages < 10 ) + printk("Memory pages belonging to domain %u:\n", d->domain_id); + + if ( d->tot_pages >= 10 ) + { + printk(" DomPage list too long to display\n"); + } + else { list_for_each_entry ( page, &d->page_list, list ) { - printk("Page %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n", + printk(" DomPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n", _p(page_to_phys(page)), _p(page_to_pfn(page)), page->count_info, page->u.inuse.type_info); } @@ -196,15 +202,10 @@ void dump_pageframe_info(struct domain *d) list_for_each_entry ( page, &d->xenpage_list, list ) { - printk("XenPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n", + printk(" XenPage %p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n", _p(page_to_phys(page)), _p(page_to_pfn(page)), page->count_info, page->u.inuse.type_info); } - - page = virt_to_page(d->shared_info); - printk("Shared_info@%p: mfn=%p, caf=%08x, taf=%" PRtype_info "\n", - _p(page_to_phys(page)), _p(page_to_pfn(page)), page->count_info, - page->u.inuse.type_info); } struct vcpu *alloc_vcpu_struct(struct domain *d, unsigned int vcpu_id) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index ebda823679..c78e104747 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -110,13 +110,11 @@ static void do_task_queues(unsigned char key) for_each_domain ( d ) { - printk("Xen: DOM %u, flags=%lx refcnt=%d nr_pages=%d " - "xenheap_pages=%d\n", d->domain_id, d->domain_flags, - atomic_read(&d->refcnt), d->tot_pages, d->xenheap_pages); - /* The handle is printed according to the OSF DCE UUID spec., even - though it is not necessarily such a thing, for ease of use when it - _is_ one of those. */ - printk(" handle=%02x%02x%02x%02x-%02x%02x-%02x%02x-" + printk("General information for domain %u:\n", d->domain_id); + printk(" flags=%lx refcnt=%d nr_pages=%d xenheap_pages=%d\n", + d->domain_flags, atomic_read(&d->refcnt), + d->tot_pages, d->xenheap_pages); + printk(" handle=%02x%02x%02x%02x-%02x%02x-%02x%02x-" "%02x%02x-%02x%02x%02x%02x%02x%02x\n", d->handle[ 0], d->handle[ 1], d->handle[ 2], d->handle[ 3], d->handle[ 4], d->handle[ 5], d->handle[ 6], d->handle[ 7], @@ -127,16 +125,17 @@ static void do_task_queues(unsigned char key) dump_pageframe_info(d); + printk("VCPU information and callbacks for domain %u:\n", + d->domain_id); for_each_vcpu ( d, v ) { - printk("Guest: %p CPU %d [has=%c] flags=%lx " - "upcall_pend = %02x, upcall_mask = %02x\n", v, - v->processor, + printk(" VCPU%d: CPU%d [has=%c] flags=%lx " + "upcall_pend = %02x, upcall_mask = %02x\n", + v->vcpu_id, v->processor, test_bit(_VCPUF_running, &v->vcpu_flags) ? 'T':'F', v->vcpu_flags, v->vcpu_info->evtchn_upcall_pending, v->vcpu_info->evtchn_upcall_mask); - printk("Notifying guest... %d/%d\n", d->domain_id, v->vcpu_id); - printk("port %d/%d stat %d %d %d\n", + printk(" Notifying guest (virq %d, port %d, stat %d/%d/%d)\n", VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG], test_bit(v->virq_to_evtchn[VIRQ_DEBUG], &d->shared_info->evtchn_pending[0]), diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c index de17a90ec5..95757a60cc 100644 --- a/xen/common/rangeset.c +++ b/xen/common/rangeset.c @@ -381,7 +381,7 @@ void rangeset_domain_printk( { struct rangeset *r; - printk("Rangesets belonging to domain %d:\n", d->domain_id); + printk("Rangesets belonging to domain %u:\n", d->domain_id); spin_lock(&d->rangesets_lock); |