Mailing List Archive

# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Node ID 364128d29f4e1be517c3a962d19616726d9cb60b
# Parent d966b7a009595b592273c0fcd0feba3b9d9bb17e
Clean up 'q' debug key output.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff -r d966b7a00959 -r 364128d29f4e xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c Sat Dec 31 13:15:22 2005
+++ b/xen/arch/x86/domain.c Sat Dec 31 13:33:00 2005
@@ -184,11 +184,17 @@
{
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 @@

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 -r d966b7a00959 -r 364128d29f4e xen/common/keyhandler.c
--- a/xen/common/keyhandler.c Sat Dec 31 13:15:22 2005
+++ b/xen/common/keyhandler.c Sat Dec 31 13:33:00 2005
@@ -110,13 +110,11 @@

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 @@

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 -r d966b7a00959 -r 364128d29f4e xen/common/rangeset.c
--- a/xen/common/rangeset.c Sat Dec 31 13:15:22 2005
+++ b/xen/common/rangeset.c Sat Dec 31 13:33:00 2005
@@ -381,7 +381,7 @@
{
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);


_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog