# HG changeset patch
# User awilliam@xxxxxxxxxxxx
# Date 1171669644 25200
# Node ID 3fa7489f87bbf99140133ae78bee249a8c0c3f36
# Parent b0aeca575dfb6b203fb83cd165304654335dc0cb
[IA64] Quieter boot
First pass at setting log levels to reduce output during Xen boot
and eliminate Xen output during normal domU boot. Use loglvl= and
guest_loglvl= to re-enable full logging.
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
xen/arch/ia64/xen/dom_fw.c | 11 ++++++-----
xen/arch/ia64/xen/domain.c | 6 +++---
xen/arch/ia64/xen/hypercall.c | 4 ++--
xen/arch/ia64/xen/regionreg.c | 6 +++---
xen/arch/ia64/xen/tlb_track.c | 6 +++---
xen/arch/ia64/xen/vcpu.c | 6 ++++--
6 files changed, 21 insertions(+), 18 deletions(-)
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/dom_fw.c
--- a/xen/arch/ia64/xen/dom_fw.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/dom_fw.c Fri Feb 16 16:47:24 2007 -0700
@@ -198,15 +198,16 @@ print_md(efi_memory_desc_t *md)
{
u64 size;
- printk("dom mem: type=%2u, attr=0x%016lx, range=[0x%016lx-0x%016lx) ",
+ printk(XENLOG_INFO "dom mem: type=%2u, attr=0x%016lx, "
+ "range=[0x%016lx-0x%016lx) ",
md->type, md->attribute, md->phys_addr,
md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT));
size = md->num_pages << EFI_PAGE_SHIFT;
if (size > ONE_MB)
- printk ("(%luMB)\n", size >> 20);
+ printk("(%luMB)\n", size >> 20);
else
- printk ("(%luKB)\n", size >> 10);
+ printk("(%luKB)\n", size >> 10);
}
static u32 lsapic_nbr;
@@ -754,11 +755,11 @@ dom_fw_init(struct domain *d,
}
printk("\n");
} else {
- printk("DomainU EFI build up:");
+ printk(XENLOG_GUEST XENLOG_INFO "DomainU EFI build up:");
tables->efi_tables[i].guid = ACPI_20_TABLE_GUID;
tables->efi_tables[i].table = FW_ACPI_BASE_PADDR;
- printk(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
+ printk(" ACPI 2.0=0x%lx", tables->efi_tables[i].table);
i++;
printk("\n");
}
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/domain.c Fri Feb 16 16:47:24 2007 -0700
@@ -519,7 +519,7 @@ int arch_domain_create(struct domain *d)
#ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
d->arch.has_pervcpu_vhpt = opt_pervcpu_vhpt;
- dprintk(XENLOG_WARNING, "%s:%d domain %d pervcpu_vhpt %d\n",
+ dprintk(XENLOG_INFO, "%s:%d domain %d pervcpu_vhpt %d\n",
__func__, __LINE__, d->domain_id, d->arch.has_pervcpu_vhpt);
#endif
if (tlb_track_create(d) < 0)
@@ -547,7 +547,7 @@ int arch_domain_create(struct domain *d)
d->arch.ioport_caps = rangeset_new(d, "I/O Ports",
RANGESETF_prettyprint_hex);
- printk ("arch_domain_create: domain=%p\n", d);
+ dprintk(XENLOG_DEBUG, "arch_domain_create: domain=%p\n", d);
return 0;
fail_nomem:
@@ -765,7 +765,7 @@ domain_set_shared_info_va (unsigned long
/* Note: this doesn't work well if other cpus are already running.
However this is part of the spec :-) */
- printk ("Domain set shared_info_va to 0x%016lx\n", va);
+ gdprintk(XENLOG_DEBUG, "Domain set shared_info_va to 0x%016lx\n", va);
d->arch.shared_info_va = va;
VCPU(v, interrupt_mask_addr) = (unsigned char *)va +
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/hypercall.c Fri Feb 16 16:47:24 2007 -0700
@@ -105,8 +105,8 @@ fw_hypercall_ipi (struct pt_regs *regs)
if (test_and_clear_bit(_VCPUF_down,
&targ->vcpu_flags)) {
vcpu_wake(targ);
- printk ("arch_boot_vcpu: vcpu %d awaken\n",
- targ->vcpu_id);
+ printk(XENLOG_INFO "arch_boot_vcpu: vcpu %d awaken\n",
+ targ->vcpu_id);
}
else
printk ("arch_boot_vcpu: huu, already awaken!\n");
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/regionreg.c Fri Feb 16 16:47:24 2007 -0700
@@ -185,9 +185,9 @@ int allocate_rid_range(struct domain *d,
d->arch.metaphysical_rr0 = allocate_metaphysical_rr(d, 0);
d->arch.metaphysical_rr4 = allocate_metaphysical_rr(d, 1);
- printk("### domain %p: rid=%x-%x mp_rid=%x\n",
- d, d->arch.starting_rid, d->arch.ending_rid,
- d->arch.starting_mp_rid);
+ dprintk(XENLOG_DEBUG, "### domain %p: rid=%x-%x mp_rid=%x\n",
+ d, d->arch.starting_rid, d->arch.ending_rid,
+ d->arch.starting_mp_rid);
return 1;
}
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/tlb_track.c
--- a/xen/arch/ia64/xen/tlb_track.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/tlb_track.c Fri Feb 16 16:47:24 2007 -0700
@@ -29,7 +29,7 @@
#define CONFIG_TLB_TRACK_DEBUG
#ifdef CONFIG_TLB_TRACK_DEBUG
# define tlb_track_printd(fmt, ...) \
- printk("%s:%d " fmt, __func__, __LINE__, ##__VA_ARGS__)
+ dprintk(XENLOG_DEBUG, fmt, ##__VA_ARGS__)
#else
# define tlb_track_printd(fmt, ...) do { } while (0)
#endif
@@ -111,8 +111,8 @@ tlb_track_create(struct domain* d)
smp_mb(); /* make initialization visible before use. */
d->arch.tlb_track = tlb_track;
- printk("%s:%d hash 0x%p hash_size %d \n",
- __func__, __LINE__, tlb_track->hash, tlb_track->hash_size);
+ dprintk(XENLOG_DEBUG, "hash 0x%p hash_size %d\n",
+ tlb_track->hash, tlb_track->hash_size);
return 0;
diff -r b0aeca575dfb -r 3fa7489f87bb xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c Fri Feb 16 15:49:05 2007 -0700
+++ b/xen/arch/ia64/xen/vcpu.c Fri Feb 16 16:47:24 2007 -0700
@@ -1017,7 +1017,8 @@ IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64
IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64 * pval)
{
// fix this when setting values other than m-bit is supported
- printk("vcpu_get_lrr0: Unmasked interrupts unsupported\n");
+ gdprintk(XENLOG_DEBUG,
+ "vcpu_get_lrr0: Unmasked interrupts unsupported\n");
*pval = (1L << 16);
return IA64_NO_FAULT;
}
@@ -1025,7 +1026,8 @@ IA64FAULT vcpu_get_lrr1(VCPU * vcpu, u64
IA64FAULT vcpu_get_lrr1(VCPU * vcpu, u64 * pval)
{
// fix this when setting values other than m-bit is supported
- printk("vcpu_get_lrr1: Unmasked interrupts unsupported\n");
+ gdprintk(XENLOG_DEBUG,
+ "vcpu_get_lrr1: Unmasked interrupts unsupported\n");
*pval = (1L << 16);
return IA64_NO_FAULT;
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home