ia64/xen-unstable

changeset 13959:3fa7489f87bb

[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@hp.com>
author awilliam@xenbuild2.aw
date Fri Feb 16 16:47:24 2007 -0700 (2007-02-16)
parents b0aeca575dfb
children 779d21cf58e7
files xen/arch/ia64/xen/dom_fw.c xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/hypercall.c xen/arch/ia64/xen/regionreg.c xen/arch/ia64/xen/tlb_track.c xen/arch/ia64/xen/vcpu.c
line diff
     1.1 --- a/xen/arch/ia64/xen/dom_fw.c	Fri Feb 16 15:49:05 2007 -0700
     1.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Fri Feb 16 16:47:24 2007 -0700
     1.3 @@ -198,15 +198,16 @@ print_md(efi_memory_desc_t *md)
     1.4  {
     1.5  	u64 size;
     1.6  	
     1.7 -	printk("dom mem: type=%2u, attr=0x%016lx, range=[0x%016lx-0x%016lx) ",
     1.8 +	printk(XENLOG_INFO "dom mem: type=%2u, attr=0x%016lx, "
     1.9 +	       "range=[0x%016lx-0x%016lx) ",
    1.10  	       md->type, md->attribute, md->phys_addr,
    1.11  	       md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT));
    1.12  
    1.13  	size = md->num_pages << EFI_PAGE_SHIFT;
    1.14  	if (size > ONE_MB)
    1.15 -		printk ("(%luMB)\n", size >> 20);
    1.16 +		printk("(%luMB)\n", size >> 20);
    1.17  	else
    1.18 -		printk ("(%luKB)\n", size >> 10);
    1.19 +		printk("(%luKB)\n", size >> 10);
    1.20  }
    1.21  
    1.22  static u32 lsapic_nbr;
    1.23 @@ -754,11 +755,11 @@ dom_fw_init(struct domain *d,
    1.24  		}
    1.25  		printk("\n");
    1.26  	} else {
    1.27 -		printk("DomainU EFI build up:");
    1.28 +		printk(XENLOG_GUEST XENLOG_INFO "DomainU EFI build up:");
    1.29  
    1.30  		tables->efi_tables[i].guid = ACPI_20_TABLE_GUID;
    1.31  		tables->efi_tables[i].table = FW_ACPI_BASE_PADDR;
    1.32 -		printk(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
    1.33 +		printk(" ACPI 2.0=0x%lx", tables->efi_tables[i].table);
    1.34  		i++;
    1.35  		printk("\n");
    1.36  	}
     2.1 --- a/xen/arch/ia64/xen/domain.c	Fri Feb 16 15:49:05 2007 -0700
     2.2 +++ b/xen/arch/ia64/xen/domain.c	Fri Feb 16 16:47:24 2007 -0700
     2.3 @@ -519,7 +519,7 @@ int arch_domain_create(struct domain *d)
     2.4  
     2.5  #ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
     2.6  	d->arch.has_pervcpu_vhpt = opt_pervcpu_vhpt;
     2.7 -	dprintk(XENLOG_WARNING, "%s:%d domain %d pervcpu_vhpt %d\n",
     2.8 +	dprintk(XENLOG_INFO, "%s:%d domain %d pervcpu_vhpt %d\n",
     2.9  	        __func__, __LINE__, d->domain_id, d->arch.has_pervcpu_vhpt);
    2.10  #endif
    2.11  	if (tlb_track_create(d) < 0)
    2.12 @@ -547,7 +547,7 @@ int arch_domain_create(struct domain *d)
    2.13  	d->arch.ioport_caps = rangeset_new(d, "I/O Ports",
    2.14  	                                   RANGESETF_prettyprint_hex);
    2.15  
    2.16 -	printk ("arch_domain_create: domain=%p\n", d);
    2.17 +	dprintk(XENLOG_DEBUG, "arch_domain_create: domain=%p\n", d);
    2.18  	return 0;
    2.19  
    2.20  fail_nomem:
    2.21 @@ -765,7 +765,7 @@ domain_set_shared_info_va (unsigned long
    2.22  
    2.23  	/* Note: this doesn't work well if other cpus are already running.
    2.24  	   However this is part of the spec :-)  */
    2.25 -	printk ("Domain set shared_info_va to 0x%016lx\n", va);
    2.26 +	gdprintk(XENLOG_DEBUG, "Domain set shared_info_va to 0x%016lx\n", va);
    2.27  	d->arch.shared_info_va = va;
    2.28  
    2.29  	VCPU(v, interrupt_mask_addr) = (unsigned char *)va +
     3.1 --- a/xen/arch/ia64/xen/hypercall.c	Fri Feb 16 15:49:05 2007 -0700
     3.2 +++ b/xen/arch/ia64/xen/hypercall.c	Fri Feb 16 16:47:24 2007 -0700
     3.3 @@ -105,8 +105,8 @@ fw_hypercall_ipi (struct pt_regs *regs)
     3.4  		if (test_and_clear_bit(_VCPUF_down,
     3.5  				       &targ->vcpu_flags)) {
     3.6  			vcpu_wake(targ);
     3.7 -			printk ("arch_boot_vcpu: vcpu %d awaken\n",
     3.8 -				targ->vcpu_id);
     3.9 +			printk(XENLOG_INFO "arch_boot_vcpu: vcpu %d awaken\n",
    3.10 +			       targ->vcpu_id);
    3.11  		}
    3.12  		else
    3.13  			printk ("arch_boot_vcpu: huu, already awaken!\n");
     4.1 --- a/xen/arch/ia64/xen/regionreg.c	Fri Feb 16 15:49:05 2007 -0700
     4.2 +++ b/xen/arch/ia64/xen/regionreg.c	Fri Feb 16 16:47:24 2007 -0700
     4.3 @@ -185,9 +185,9 @@ int allocate_rid_range(struct domain *d,
     4.4  	d->arch.metaphysical_rr0 = allocate_metaphysical_rr(d, 0);
     4.5  	d->arch.metaphysical_rr4 = allocate_metaphysical_rr(d, 1);
     4.6  
     4.7 -	printk("### domain %p: rid=%x-%x mp_rid=%x\n",
     4.8 -	       d, d->arch.starting_rid, d->arch.ending_rid,
     4.9 -	       d->arch.starting_mp_rid);
    4.10 +	dprintk(XENLOG_DEBUG, "### domain %p: rid=%x-%x mp_rid=%x\n",
    4.11 +		d, d->arch.starting_rid, d->arch.ending_rid,
    4.12 +		d->arch.starting_mp_rid);
    4.13  	
    4.14  	return 1;
    4.15  }
     5.1 --- a/xen/arch/ia64/xen/tlb_track.c	Fri Feb 16 15:49:05 2007 -0700
     5.2 +++ b/xen/arch/ia64/xen/tlb_track.c	Fri Feb 16 16:47:24 2007 -0700
     5.3 @@ -29,7 +29,7 @@
     5.4  #define CONFIG_TLB_TRACK_DEBUG
     5.5  #ifdef CONFIG_TLB_TRACK_DEBUG
     5.6  # define tlb_track_printd(fmt, ...)     \
     5.7 -    printk("%s:%d " fmt, __func__, __LINE__, ##__VA_ARGS__)
     5.8 +    dprintk(XENLOG_DEBUG, fmt, ##__VA_ARGS__)
     5.9  #else
    5.10  # define tlb_track_printd(fmt, ...)     do { } while (0)
    5.11  #endif
    5.12 @@ -111,8 +111,8 @@ tlb_track_create(struct domain* d)
    5.13  
    5.14      smp_mb(); /* make initialization visible before use. */
    5.15      d->arch.tlb_track = tlb_track;
    5.16 -    printk("%s:%d hash 0x%p hash_size %d \n",
    5.17 -           __func__, __LINE__, tlb_track->hash, tlb_track->hash_size);
    5.18 +    dprintk(XENLOG_DEBUG, "hash 0x%p hash_size %d\n",
    5.19 +            tlb_track->hash, tlb_track->hash_size);
    5.20  
    5.21      return 0;
    5.22  
     6.1 --- a/xen/arch/ia64/xen/vcpu.c	Fri Feb 16 15:49:05 2007 -0700
     6.2 +++ b/xen/arch/ia64/xen/vcpu.c	Fri Feb 16 16:47:24 2007 -0700
     6.3 @@ -1017,7 +1017,8 @@ IA64FAULT vcpu_get_cmcv(VCPU * vcpu, u64
     6.4  IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64 * pval)
     6.5  {
     6.6  	// fix this when setting values other than m-bit is supported
     6.7 -	printk("vcpu_get_lrr0: Unmasked interrupts unsupported\n");
     6.8 +	gdprintk(XENLOG_DEBUG,
     6.9 +		 "vcpu_get_lrr0: Unmasked interrupts unsupported\n");
    6.10  	*pval = (1L << 16);
    6.11  	return IA64_NO_FAULT;
    6.12  }
    6.13 @@ -1025,7 +1026,8 @@ IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64
    6.14  IA64FAULT vcpu_get_lrr1(VCPU * vcpu, u64 * pval)
    6.15  {
    6.16  	// fix this when setting values other than m-bit is supported
    6.17 -	printk("vcpu_get_lrr1: Unmasked interrupts unsupported\n");
    6.18 +	gdprintk(XENLOG_DEBUG,
    6.19 +		 "vcpu_get_lrr1: Unmasked interrupts unsupported\n");
    6.20  	*pval = (1L << 16);
    6.21  	return IA64_NO_FAULT;
    6.22  }