# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 389aced92bc7ffd601a5d3a0466a31fb9704723c
# Parent 3fe7b0b7f6c5ffde300b6518c50d6e05e84a4c10
Now we have verbose=y in Xen by default, tidy up a few unhelpful printk's.
Signed-off-by: ian@xxxxxxxxxxxxx
diff -r 3fe7b0b7f6c5 -r 389aced92bc7 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Sun Aug 14 09:17:54 2005
+++ b/xen/arch/x86/mm.c Sun Aug 14 16:55:34 2005
@@ -2841,7 +2841,7 @@
* Writable Pagetables
*/
-#ifdef VERBOSE
+#ifdef VVERBOSE
int ptwr_debug = 0x0;
#define PTWR_PRINTK(_f, _a...) \
do { if ( unlikely(ptwr_debug) ) printk( _f , ## _a ); } while ( 0 )
@@ -3054,7 +3054,7 @@
*/
BUG();
}
- PTWR_PRINTK("[%c] disconnected_l1va at %p is %lx\n",
+ PTWR_PRINTK("[%c] disconnected_l1va at %p is %" PRIpte "\n",
PTWR_PRINT_WHICH, ptep, pte.l1);
l1e_remove_flags(pte, _PAGE_RW);
@@ -3072,7 +3072,7 @@
/* Ensure that there are no stale writable mappings in any TLB. */
/* NB. INVLPG is a serialising instruction: flushes pending updates. */
flush_tlb_one_mask(d->cpumask, l1va);
- PTWR_PRINTK("[%c] disconnected_l1va at %p now %lx\n",
+ PTWR_PRINTK("[%c] disconnected_l1va at %p now %" PRIpte "\n",
PTWR_PRINT_WHICH, ptep, pte.l1);
/*
diff -r 3fe7b0b7f6c5 -r 389aced92bc7 xen/arch/x86/shadow.c
--- a/xen/arch/x86/shadow.c Sun Aug 14 09:17:54 2005
+++ b/xen/arch/x86/shadow.c Sun Aug 14 16:55:34 2005
@@ -1578,7 +1578,7 @@
if ( unlikely(!VALID_MFN(gmfn)) )
{
- SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
+ SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
*spte_p = l1e_empty();
return 0;
}
@@ -1612,7 +1612,7 @@
if ( unlikely(!VALID_MFN(mfn)) )
{
- SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
+ SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
*spte_p = l1e_empty();
return 0;
}
diff -r 3fe7b0b7f6c5 -r 389aced92bc7 xen/arch/x86/shadow32.c
--- a/xen/arch/x86/shadow32.c Sun Aug 14 09:17:54 2005
+++ b/xen/arch/x86/shadow32.c Sun Aug 14 16:55:34 2005
@@ -665,7 +665,7 @@
shadow_audit(d, 0);
- SH_LOG("Free shadow table.");
+ SH_VLOG("Free shadow table.");
}
void shadow_mode_init(void)
@@ -1137,7 +1137,7 @@
d->arch.shadow_ht_free = NULL;
ASSERT(d->arch.shadow_extras_count == 0);
- SH_LOG("freed extras, now %d", d->arch.shadow_extras_count);
+ SH_VLOG("freed extras, now %d", d->arch.shadow_extras_count);
if ( d->arch.shadow_dirty_bitmap != NULL )
{
diff -r 3fe7b0b7f6c5 -r 389aced92bc7 xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h Sun Aug 14 09:17:54 2005
+++ b/xen/include/asm-x86/shadow.h Sun Aug 14 16:55:34 2005
@@ -483,9 +483,9 @@
#ifndef NDEBUG
else if ( mfn < max_page )
{
- SH_LOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
+ SH_VLOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (dom %p)",
mfn, pfn, d->arch.shadow_dirty_bitmap_size, d);
- SH_LOG("dom=%p caf=%08x taf=%" PRtype_info,
+ SH_VLOG("dom=%p caf=%08x taf=%" PRtype_info,
page_get_owner(&frame_table[mfn]),
frame_table[mfn].count_info,
frame_table[mfn].u.inuse.type_info );
@@ -736,7 +736,7 @@
if ( unlikely(!VALID_MFN(gmfn)) )
{
- SH_LOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
+ SH_VLOG("l1pte_write_fault: invalid gpfn=%lx", gpfn);
*spte_p = l1e_empty();
return 0;
}
@@ -770,7 +770,7 @@
if ( unlikely(!VALID_MFN(mfn)) )
{
- SH_LOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
+ SH_VLOG("l1pte_read_fault: invalid gpfn=%lx", pfn);
*spte_p = l1e_empty();
return 0;
}
@@ -1472,7 +1472,7 @@
/* We need to allocate a new node. Ensure the quicklist is non-empty. */
if ( unlikely(d->arch.shadow_ht_free == NULL) )
{
- SH_LOG("Allocate more shadow hashtable blocks.");
+ SH_VLOG("Allocate more shadow hashtable blocks.");
extra = xmalloc_bytes(
sizeof(void *) + (shadow_ht_extra_size * sizeof(*x)));
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home