# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1192094445 -3600
# Node ID 8d51b80fcb6f002f53a5ab293f1ab87384837397
# Parent ab5b615867ee7913ae6f0afe49f7a5e8ad20ea94
Shadow code printing adjustments.
Messages prior to BUG() should always be displayed, not just when
DEBUG_TRACE_DUMP is defined (which by default it isn't). Convert them
from SHADOW_PRINTK() to SHADOW_ERROR().
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/mm/shadow/common.c | 20 ++++++++++----------
xen/arch/x86/mm/shadow/multi.c | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff -r ab5b615867ee -r 8d51b80fcb6f xen/arch/x86/mm/shadow/common.c
--- a/xen/arch/x86/mm/shadow/common.c Thu Oct 11 10:02:07 2007 +0100
+++ b/xen/arch/x86/mm/shadow/common.c Thu Oct 11 10:20:45 2007 +0100
@@ -746,7 +746,7 @@ void shadow_unhook_mappings(struct vcpu
break;
#endif
default:
- SHADOW_PRINTK("top-level shadow has bad type %08x\n", sp->type);
+ SHADOW_ERROR("top-level shadow has bad type %08x\n", sp->type);
BUG();
}
}
@@ -814,12 +814,12 @@ void shadow_prealloc(struct domain *d, u
/* Nothing more we can do: all remaining shadows are of pages that
* hold Xen mappings for some vcpu. This can never happen. */
- SHADOW_PRINTK("Can't pre-allocate %i shadow pages!\n"
- " shadow pages total = %u, free = %u, p2m=%u\n",
- 1 << order,
- d->arch.paging.shadow.total_pages,
- d->arch.paging.shadow.free_pages,
- d->arch.paging.shadow.p2m_pages);
+ SHADOW_ERROR("Can't pre-allocate %i shadow pages!\n"
+ " shadow pages total = %u, free = %u, p2m=%u\n",
+ 1 << order,
+ d->arch.paging.shadow.total_pages,
+ d->arch.paging.shadow.free_pages,
+ d->arch.paging.shadow.p2m_pages);
BUG();
}
@@ -912,7 +912,7 @@ mfn_t shadow_alloc(struct domain *d,
* It means that we didn't call shadow_prealloc() correctly before
* we allocated. We can't recover by calling prealloc here, because
* we might free up higher-level pages that the caller is working on. */
- SHADOW_PRINTK("Can't allocate %i shadow pages!\n", 1 << order);
+ SHADOW_ERROR("Can't allocate %i shadow pages!\n", 1 << order);
BUG();
found:
@@ -1605,8 +1605,8 @@ void sh_destroy_shadow(struct vcpu *v, m
break;
#endif
default:
- SHADOW_PRINTK("tried to destroy shadow of bad type %08lx\n",
- (unsigned long)t);
+ SHADOW_ERROR("tried to destroy shadow of bad type %08lx\n",
+ (unsigned long)t);
BUG();
}
}
diff -r ab5b615867ee -r 8d51b80fcb6f xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c Thu Oct 11 10:02:07 2007 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c Thu Oct 11 10:20:45 2007 +0100
@@ -2472,7 +2472,7 @@ sh_map_and_validate_gl4e(struct vcpu *v,
shadow_l4_index,
validate_gl4e);
#else // ! GUEST_PAGING_LEVELS >= 4
- SHADOW_PRINTK("called in wrong paging mode!\n");
+ SHADOW_ERROR("called in wrong paging mode!\n");
BUG();
return 0;
#endif
@@ -2488,7 +2488,7 @@ sh_map_and_validate_gl3e(struct vcpu *v,
shadow_l3_index,
validate_gl3e);
#else // ! GUEST_PAGING_LEVELS >= 4
- SHADOW_PRINTK("called in wrong paging mode!\n");
+ SHADOW_ERROR("called in wrong paging mode!\n");
BUG();
return 0;
#endif
@@ -2514,7 +2514,7 @@ sh_map_and_validate_gl2he(struct vcpu *v
shadow_l2_index,
validate_gl2e);
#else /* Non-PAE guests don't have different kinds of l2 table */
- SHADOW_PRINTK("called in wrong paging mode!\n");
+ SHADOW_ERROR("called in wrong paging mode!\n");
BUG();
return 0;
#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home