ia64/xen-unstable

changeset 11947:29b02d929b7e

[XEN] Remove definition of printf. All users are switched to printk.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Mon Oct 23 14:42:52 2006 +0100 (2006-10-23)
parents f5d179bcad70
children 030630c4e3ed
files xen/arch/ia64/linux-xen/setup.c xen/arch/ia64/vmx/mm.c xen/arch/ia64/vmx/mmio.c xen/arch/ia64/vmx/vmx_phy_mode.c xen/arch/ia64/vmx/vmx_vcpu.c xen/arch/ia64/vmx/vmx_virt.c xen/arch/ia64/xen/dom0_ops.c xen/arch/ia64/xen/dom_fw.c xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/faults.c xen/arch/ia64/xen/fw_emul.c xen/arch/ia64/xen/hypercall.c xen/arch/ia64/xen/hyperprivop.S xen/arch/ia64/xen/irq.c xen/arch/ia64/xen/mm.c xen/arch/ia64/xen/privop.c xen/arch/ia64/xen/regionreg.c xen/arch/ia64/xen/vcpu.c xen/arch/ia64/xen/vhpt.c xen/arch/ia64/xen/xenmisc.c xen/arch/ia64/xen/xensetup.c xen/arch/ia64/xen/xentime.c xen/arch/powerpc/backtrace.c xen/arch/powerpc/domain.c xen/arch/powerpc/of-devwalk.c xen/arch/powerpc/powerpc64/domain.c xen/arch/x86/boot/x86_32.S xen/arch/x86/boot/x86_64.S xen/arch/x86/hvm/hvm.c xen/arch/x86/hvm/io.c xen/arch/x86/hvm/platform.c xen/arch/x86/hvm/svm/intr.c xen/arch/x86/hvm/svm/svm.c xen/arch/x86/hvm/svm/vmcb.c xen/arch/x86/hvm/vmx/vmx.c xen/arch/x86/setup.c xen/arch/x86/x86_32/entry.S xen/arch/x86/x86_32/supervisor_mode_kernel.S xen/arch/x86/x86_64/entry.S xen/common/sched_sedf.c xen/drivers/char/console.c xen/include/asm-ia64/config.h xen/include/asm-ia64/vcpu.h xen/include/xen/lib.h
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/setup.c	Mon Oct 23 14:19:14 2006 +0100
     1.2 +++ b/xen/arch/ia64/linux-xen/setup.c	Mon Oct 23 14:42:52 2006 +0100
     1.3 @@ -803,7 +803,7 @@ cpu_init (void)
     1.4  	cpu_data = per_cpu_init();
     1.5  
     1.6  #ifdef XEN
     1.7 -	printf ("cpu_init: current=%p\n", current);
     1.8 +	printk("cpu_init: current=%p\n", current);
     1.9  #endif
    1.10  
    1.11  	/*
     2.1 --- a/xen/arch/ia64/vmx/mm.c	Mon Oct 23 14:19:14 2006 +0100
     2.2 +++ b/xen/arch/ia64/vmx/mm.c	Mon Oct 23 14:42:52 2006 +0100
     2.3 @@ -144,7 +144,7 @@ int vmx_do_mmu_update(mmu_update_t *ureq
     2.4              gpfn = req.val;
     2.5              set_machinetophys(mfn,gpfn);
     2.6          }else{
     2.7 -            printf("Unkown command of mmu_update:ptr: %lx,val: %lx \n",req.ptr,req.val);
     2.8 +            printk("Unkown command of mmu_update:ptr: %lx,val: %lx \n",req.ptr,req.val);
     2.9              while(1);
    2.10          }
    2.11          ureqs ++;
     3.1 --- a/xen/arch/ia64/vmx/mmio.c	Mon Oct 23 14:19:14 2006 +0100
     3.2 +++ b/xen/arch/ia64/vmx/mmio.c	Mon Oct 23 14:42:52 2006 +0100
     3.3 @@ -80,7 +80,7 @@ static void pib_write(VCPU *vcpu, void *
     3.4              }
     3.5          }
     3.6          else {      // upper half
     3.7 -            printf("IPI-UHF write %lx\n",pib_off);
     3.8 +            printk("IPI-UHF write %lx\n",pib_off);
     3.9              panic_domain(NULL,"Not support yet for SM-VP\n");
    3.10          }
    3.11          break;
    3.12 @@ -114,7 +114,7 @@ static void pib_read(VCPU *vcpu, uint64_
    3.13              }
    3.14              else {
    3.15  #ifdef  IPI_DEBUG
    3.16 -                printf("IPI-LHF read %lx\n",pib_off);
    3.17 +                printk("IPI-LHF read %lx\n",pib_off);
    3.18  #endif
    3.19                  *(uint64_t *)dest = 0;  // TODO for SM-VP
    3.20              }
    3.21 @@ -125,7 +125,7 @@ static void pib_read(VCPU *vcpu, uint64_
    3.22              }
    3.23              else {
    3.24  #ifdef  IPI_DEBUG
    3.25 -                printf("IPI-UHF read %lx\n",pib_off);
    3.26 +                printk("IPI-UHF read %lx\n",pib_off);
    3.27  #endif
    3.28                  *(uint8_t *)dest = 0;   // TODO for SM-VP
    3.29              }
    3.30 @@ -321,7 +321,7 @@ memread_p(VCPU *vcpu, u64 *src, u64 *des
    3.31  static void deliver_ipi (VCPU *vcpu, uint64_t dm, uint64_t vector)
    3.32  {
    3.33  #ifdef  IPI_DEBUG
    3.34 -  printf ("deliver_ipi %lx %lx\n",dm,vector);
    3.35 +  printk ("deliver_ipi %lx %lx\n",dm,vector);
    3.36  #endif
    3.37      switch ( dm ) {
    3.38      case 0:     // INT
    3.39 @@ -387,7 +387,7 @@ static void write_ipi (VCPU *vcpu, uint6
    3.40          memset (&c, 0, sizeof (c));
    3.41  
    3.42          if (arch_set_info_guest (targ, &c) != 0) {
    3.43 -            printf ("arch_boot_vcpu: failure\n");
    3.44 +            printk ("arch_boot_vcpu: failure\n");
    3.45              return;
    3.46          }
    3.47          /* First or next rendez-vous: set registers.  */
    3.48 @@ -397,11 +397,11 @@ static void write_ipi (VCPU *vcpu, uint6
    3.49  
    3.50          if (test_and_clear_bit(_VCPUF_down,&targ->vcpu_flags)) {
    3.51              vcpu_wake(targ);
    3.52 -            printf ("arch_boot_vcpu: vcpu %d awaken %016lx!\n",
    3.53 +            printk ("arch_boot_vcpu: vcpu %d awaken %016lx!\n",
    3.54                      targ->vcpu_id, targ_regs->cr_iip);
    3.55          }
    3.56          else
    3.57 -            printf ("arch_boot_vcpu: huu, already awaken!");
    3.58 +            printk ("arch_boot_vcpu: huu, already awaken!");
    3.59      }
    3.60      else {
    3.61          int running = test_bit(_VCPUF_running,&targ->vcpu_flags);
     4.1 --- a/xen/arch/ia64/vmx/vmx_phy_mode.c	Mon Oct 23 14:19:14 2006 +0100
     4.2 +++ b/xen/arch/ia64/vmx/vmx_phy_mode.c	Mon Oct 23 14:42:52 2006 +0100
     4.3 @@ -265,7 +265,7 @@ switch_mm_mode(VCPU *vcpu, IA64_PSR old_
     4.4      perfc_incra(vmx_switch_mm_mode, act);
     4.5      switch (act) {
     4.6      case SW_V2P:
     4.7 -//        printf("V -> P mode transition: (0x%lx -> 0x%lx)\n",
     4.8 +//        printk("V -> P mode transition: (0x%lx -> 0x%lx)\n",
     4.9  //               old_psr.val, new_psr.val);
    4.10          vcpu->arch.old_rsc = regs->ar_rsc;
    4.11          switch_to_physical_rid(vcpu);
    4.12 @@ -277,7 +277,7 @@ switch_mm_mode(VCPU *vcpu, IA64_PSR old_
    4.13          vcpu->arch.mode_flags |= GUEST_IN_PHY;
    4.14          break;
    4.15      case SW_P2V:
    4.16 -//        printf("P -> V mode transition: (0x%lx -> 0x%lx)\n",
    4.17 +//        printk("P -> V mode transition: (0x%lx -> 0x%lx)\n",
    4.18  //               old_psr.val, new_psr.val);
    4.19          switch_to_virtual_rid(vcpu);
    4.20          /*
    4.21 @@ -288,11 +288,11 @@ switch_mm_mode(VCPU *vcpu, IA64_PSR old_
    4.22          vcpu->arch.mode_flags &= ~GUEST_IN_PHY;
    4.23          break;
    4.24      case SW_SELF:
    4.25 -        printf("Switch to self-0x%lx!!! MM mode doesn't change...\n",
    4.26 +        printk("Switch to self-0x%lx!!! MM mode doesn't change...\n",
    4.27              old_psr.val);
    4.28          break;
    4.29      case SW_NOP:
    4.30 -//        printf("No action required for mode transition: (0x%lx -> 0x%lx)\n",
    4.31 +//        printk("No action required for mode transition: (0x%lx -> 0x%lx)\n",
    4.32  //               old_psr.val, new_psr.val);
    4.33          break;
    4.34      default:
     5.1 --- a/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Oct 23 14:19:14 2006 +0100
     5.2 +++ b/xen/arch/ia64/vmx/vmx_vcpu.c	Mon Oct 23 14:42:52 2006 +0100
     5.3 @@ -246,7 +246,7 @@ check_entry(u64 va, u64 ps, char *str)
     5.4        va == 0x600000000000C000UL ) {
     5.5      stop();
     5.6       }
     5.7 -     if (tlb_debug) printf("%s at %lx %lx\n", str, va, 1UL<<ps);
     5.8 +     if (tlb_debug) printk("%s at %lx %lx\n", str, va, 1UL<<ps);
     5.9  }
    5.10  #endif
    5.11  
     6.1 --- a/xen/arch/ia64/vmx/vmx_virt.c	Mon Oct 23 14:19:14 2006 +0100
     6.2 +++ b/xen/arch/ia64/vmx/vmx_virt.c	Mon Oct 23 14:42:52 2006 +0100
     6.3 @@ -1364,7 +1364,7 @@ vmx_emulate(VCPU *vcpu, REGS *regs)
     6.4  #endif
     6.5  #if 0
     6.6  if ( (cause == 0xff && opcode == 0x1e000000000) || cause == 0 ) {
     6.7 -		printf ("VMAL decode error: cause - %lx; op - %lx\n", 
     6.8 +		printk ("VMAL decode error: cause - %lx; op - %lx\n", 
     6.9  			cause, opcode );
    6.10  		return;
    6.11  }
    6.12 @@ -1381,7 +1381,7 @@ if ( (cause == 0xff && opcode == 0x1e000
    6.13      else if (slot == 1)
    6.14          inst.inst = bundle.slot1a + (bundle.slot1b<<18);
    6.15      else if (slot == 2) inst.inst = bundle.slot2;
    6.16 -    else printf("priv_handle_op: illegal slot: %d\n", slot);
    6.17 +    else printk("priv_handle_op: illegal slot: %d\n", slot);
    6.18      slot_type = slot_types[bundle.template][slot];
    6.19      ia64_priv_decoder(slot_type, inst, &cause);
    6.20      if(cause==0){
    6.21 @@ -1554,7 +1554,7 @@ if ( (cause == 0xff && opcode == 0x1e000
    6.22          status=vmx_emul_mov_from_cpuid(vcpu, inst);
    6.23          break;
    6.24      case EVENT_VMSW:
    6.25 -        printf ("Unimplemented instruction %ld\n", cause);
    6.26 +        printk ("Unimplemented instruction %ld\n", cause);
    6.27  	status=IA64_FAULT;
    6.28          break;
    6.29      default:
     7.1 --- a/xen/arch/ia64/xen/dom0_ops.c	Mon Oct 23 14:19:14 2006 +0100
     7.2 +++ b/xen/arch/ia64/xen/dom0_ops.c	Mon Oct 23 14:42:52 2006 +0100
     7.3 @@ -171,7 +171,7 @@ long arch_do_domctl(xen_domctl_t *op, XE
     7.4      }
     7.5      break;
     7.6      default:
     7.7 -        printf("arch_do_domctl: unrecognized domctl: %d!!!\n",op->cmd);
     7.8 +        printk("arch_do_domctl: unrecognized domctl: %d!!!\n",op->cmd);
     7.9          ret = -ENOSYS;
    7.10  
    7.11      }
    7.12 @@ -211,7 +211,7 @@ long arch_do_sysctl(xen_sysctl_t *op, XE
    7.13      break;
    7.14  
    7.15      default:
    7.16 -        printf("arch_do_sysctl: unrecognized sysctl: %d!!!\n",op->cmd);
    7.17 +        printk("arch_do_sysctl: unrecognized sysctl: %d!!!\n",op->cmd);
    7.18          ret = -ENOSYS;
    7.19  
    7.20      }
    7.21 @@ -273,7 +273,7 @@ do_dom0vp_op(unsigned long cmd,
    7.22          break;
    7.23      default:
    7.24          ret = -1;
    7.25 -		printf("unknown dom0_vp_op 0x%lx\n", cmd);
    7.26 +		printk("unknown dom0_vp_op 0x%lx\n", cmd);
    7.27          break;
    7.28      }
    7.29  
     8.1 --- a/xen/arch/ia64/xen/dom_fw.c	Mon Oct 23 14:19:14 2006 +0100
     8.2 +++ b/xen/arch/ia64/xen/dom_fw.c	Mon Oct 23 14:42:52 2006 +0100
     8.3 @@ -204,9 +204,9 @@ print_md(efi_memory_desc_t *md)
     8.4  
     8.5  	size = md->num_pages << EFI_PAGE_SHIFT;
     8.6  	if (size > ONE_MB)
     8.7 -		printf ("(%luMB)\n", size >> 20);
     8.8 +		printk ("(%luMB)\n", size >> 20);
     8.9  	else
    8.10 -		printf ("(%luKB)\n", size >> 10);
    8.11 +		printk ("(%luKB)\n", size >> 10);
    8.12  }
    8.13  
    8.14  static u32 lsapic_nbr;
    8.15 @@ -574,7 +574,7 @@ complete_dom0_memmap(struct domain *d,
    8.16  
    8.17  		default:
    8.18  			/* Print a warning but continue.  */
    8.19 -			printf("complete_dom0_memmap: warning: "
    8.20 +			printk("complete_dom0_memmap: warning: "
    8.21  			       "unhandled MDT entry type %u\n", md->type);
    8.22  		}
    8.23  	}
    8.24 @@ -734,47 +734,47 @@ dom_fw_init(struct domain *d,
    8.25  		/* Write messages to the console.  */
    8.26  		touch_acpi_table();
    8.27  
    8.28 -		printf("Domain0 EFI passthrough:");
    8.29 +		printk("Domain0 EFI passthrough:");
    8.30  		if (efi.mps) {
    8.31  			tables->efi_tables[i].guid = MPS_TABLE_GUID;
    8.32  			tables->efi_tables[i].table = __pa(efi.mps);
    8.33 -			printf(" MPS=0x%lx",tables->efi_tables[i].table);
    8.34 +			printk(" MPS=0x%lx",tables->efi_tables[i].table);
    8.35  			i++;
    8.36  		}
    8.37  
    8.38  		if (efi.acpi20) {
    8.39  			tables->efi_tables[i].guid = ACPI_20_TABLE_GUID;
    8.40  			tables->efi_tables[i].table = __pa(efi.acpi20);
    8.41 -			printf(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
    8.42 +			printk(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
    8.43  			i++;
    8.44  		}
    8.45  		if (efi.acpi) {
    8.46  			tables->efi_tables[i].guid = ACPI_TABLE_GUID;
    8.47  			tables->efi_tables[i].table = __pa(efi.acpi);
    8.48 -			printf(" ACPI=0x%lx",tables->efi_tables[i].table);
    8.49 +			printk(" ACPI=0x%lx",tables->efi_tables[i].table);
    8.50  			i++;
    8.51  		}
    8.52  		if (efi.smbios) {
    8.53  			tables->efi_tables[i].guid = SMBIOS_TABLE_GUID;
    8.54  			tables->efi_tables[i].table = __pa(efi.smbios);
    8.55 -			printf(" SMBIOS=0x%lx",tables->efi_tables[i].table);
    8.56 +			printk(" SMBIOS=0x%lx",tables->efi_tables[i].table);
    8.57  			i++;
    8.58  		}
    8.59  		if (efi.hcdp) {
    8.60  			tables->efi_tables[i].guid = HCDP_TABLE_GUID;
    8.61  			tables->efi_tables[i].table = __pa(efi.hcdp);
    8.62 -			printf(" HCDP=0x%lx",tables->efi_tables[i].table);
    8.63 +			printk(" HCDP=0x%lx",tables->efi_tables[i].table);
    8.64  			i++;
    8.65  		}
    8.66 -		printf("\n");
    8.67 +		printk("\n");
    8.68  	} else {
    8.69 -		printf("DomainU EFI build up:");
    8.70 +		printk("DomainU EFI build up:");
    8.71  
    8.72  		tables->efi_tables[i].guid = ACPI_20_TABLE_GUID;
    8.73  		tables->efi_tables[i].table = FW_ACPI_BASE_PADDR;
    8.74 -		printf(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
    8.75 +		printk(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
    8.76  		i++;
    8.77 -		printf("\n");
    8.78 +		printk("\n");
    8.79  	}
    8.80  
    8.81  	/* fill in the SAL system table: */
     9.1 --- a/xen/arch/ia64/xen/domain.c	Mon Oct 23 14:19:14 2006 +0100
     9.2 +++ b/xen/arch/ia64/xen/domain.c	Mon Oct 23 14:42:52 2006 +0100
     9.3 @@ -388,7 +388,7 @@ int arch_domain_create(struct domain *d)
     9.4  	d->arch.ioport_caps = rangeset_new(d, "I/O Ports",
     9.5  	                                   RANGESETF_prettyprint_hex);
     9.6  
     9.7 -	printf ("arch_domain_create: domain=%p\n", d);
     9.8 +	printk ("arch_domain_create: domain=%p\n", d);
     9.9  	return 0;
    9.10  
    9.11  fail_nomem:
    9.12 @@ -598,7 +598,7 @@ domain_set_shared_info_va (unsigned long
    9.13  
    9.14  	/* Note: this doesn't work well if other cpus are already running.
    9.15  	   However this is part of the spec :-)  */
    9.16 -	printf ("Domain set shared_info_va to 0x%016lx\n", va);
    9.17 +	printk ("Domain set shared_info_va to 0x%016lx\n", va);
    9.18  	d->arch.shared_info_va = va;
    9.19  
    9.20  	for_each_vcpu (d, v1) {
    9.21 @@ -857,7 +857,7 @@ void alloc_dom0(void)
    9.22  	}
    9.23  	if (dom0_size % dom0_align) {
    9.24  		dom0_size = (dom0_size / dom0_align + 1) * dom0_align;
    9.25 -		printf("dom0_size rounded up to %ld, due to dom0_align=%lx\n",
    9.26 +		printk("dom0_size rounded up to %ld, due to dom0_align=%lx\n",
    9.27  		     dom0_size,dom0_align);
    9.28  	}
    9.29  
    9.30 @@ -915,7 +915,7 @@ int construct_dom0(struct domain *d,
    9.31  	struct page_info *page = NULL;
    9.32  #endif
    9.33  
    9.34 -//printf("construct_dom0: starting\n");
    9.35 +//printk("construct_dom0: starting\n");
    9.36  
    9.37  	/* Sanity! */
    9.38  	BUG_ON(d != dom0);
    9.39 @@ -1019,10 +1019,10 @@ int construct_dom0(struct domain *d,
    9.40  	if (dom0_max_vcpus > MAX_VIRT_CPUS)
    9.41  	    dom0_max_vcpus = MAX_VIRT_CPUS;
    9.42  	
    9.43 -	printf ("Dom0 max_vcpus=%d\n", dom0_max_vcpus);
    9.44 +	printk ("Dom0 max_vcpus=%d\n", dom0_max_vcpus);
    9.45  	for ( i = 1; i < dom0_max_vcpus; i++ )
    9.46  	    if (alloc_vcpu(d, i, i) == NULL)
    9.47 -		printf ("Cannot allocate dom0 vcpu %d\n", i);
    9.48 +		printk ("Cannot allocate dom0 vcpu %d\n", i);
    9.49  
    9.50  	/* Copy the OS image. */
    9.51  	loaddomainelfimage(d,image_start);
    9.52 @@ -1111,7 +1111,7 @@ void machine_restart(char * __unused)
    9.53  {
    9.54  	console_start_sync();
    9.55  	if (running_on_sim)
    9.56 -		printf ("machine_restart called.  spinning...\n");
    9.57 +		printk ("machine_restart called.  spinning...\n");
    9.58  	else
    9.59  		(*efi.reset_system)(EFI_RESET_WARM,0,0,NULL);
    9.60  	while(1);
    9.61 @@ -1123,7 +1123,7 @@ void machine_halt(void)
    9.62  {
    9.63  	console_start_sync();
    9.64  	if (running_on_sim)
    9.65 -		printf ("machine_halt called.  spinning...\n");
    9.66 +		printk ("machine_halt called.  spinning...\n");
    9.67  	else
    9.68  		cpu_halt();
    9.69  	while(1);
    10.1 --- a/xen/arch/ia64/xen/faults.c	Mon Oct 23 14:19:14 2006 +0100
    10.2 +++ b/xen/arch/ia64/xen/faults.c	Mon Oct 23 14:42:52 2006 +0100
    10.3 @@ -104,11 +104,11 @@ void reflect_extint(struct pt_regs *regs
    10.4  	static int first_extint = 1;
    10.5  
    10.6  	if (first_extint) {
    10.7 -		printf("Delivering first extint to domain: isr=0x%lx, iip=0x%lx\n", isr, regs->cr_iip);
    10.8 +		printk("Delivering first extint to domain: isr=0x%lx, iip=0x%lx\n", isr, regs->cr_iip);
    10.9  		first_extint = 0;
   10.10  	}
   10.11  	if (vcpu_timer_pending_early(v))
   10.12 -printf("*#*#*#* about to deliver early timer to domain %d!!!\n",v->domain->domain_id);
   10.13 +printk("*#*#*#* about to deliver early timer to domain %d!!!\n",v->domain->domain_id);
   10.14  	PSCB(current,itir) = 0;
   10.15  	reflect_interruption(isr,regs,IA64_EXTINT_VECTOR);
   10.16  }
   10.17 @@ -128,7 +128,7 @@ void reflect_event(struct pt_regs *regs)
   10.18  		return;
   10.19  
   10.20  	if (!PSCB(v,interrupt_collection_enabled))
   10.21 -		printf("psr.ic off, delivering event, ipsr=%lx,iip=%lx,isr=%lx,viip=0x%lx\n",
   10.22 +		printk("psr.ic off, delivering event, ipsr=%lx,iip=%lx,isr=%lx,viip=0x%lx\n",
   10.23  		       regs->cr_ipsr, regs->cr_iip, isr, PSCB(v, iip));
   10.24  	PSCB(v,unat) = regs->ar_unat;  // not sure if this is really needed?
   10.25  	PSCB(v,precover_ifs) = regs->cr_ifs;
   10.26 @@ -241,7 +241,7 @@ void ia64_do_page_fault (unsigned long a
   10.27  
   10.28  	if (!PSCB(current,interrupt_collection_enabled)) {
   10.29  		check_bad_nested_interruption(isr,regs,fault);
   10.30 -		//printf("Delivering NESTED DATA TLB fault\n");
   10.31 +		//printk("Delivering NESTED DATA TLB fault\n");
   10.32  		fault = IA64_DATA_NESTED_TLB_VECTOR;
   10.33  		regs->cr_iip = ((unsigned long) PSCBX(current,iva) + fault) & ~0xffUL;
   10.34  		regs->cr_ipsr = (regs->cr_ipsr & ~DELIVER_PSR_CLR) | DELIVER_PSR_SET;
   10.35 @@ -370,7 +370,7 @@ ia64_fault (unsigned long vector, unsign
   10.36  		"Unknown fault 13", "Unknown fault 14", "Unknown fault 15"
   10.37  	};
   10.38  
   10.39 -	printf("ia64_fault, vector=0x%lx, ifa=0x%016lx, iip=0x%016lx, ipsr=0x%016lx, isr=0x%016lx\n",
   10.40 +	printk("ia64_fault, vector=0x%lx, ifa=0x%016lx, iip=0x%016lx, ipsr=0x%016lx, isr=0x%016lx\n",
   10.41  	       vector, ifa, regs->cr_iip, regs->cr_ipsr, isr);
   10.42  
   10.43  
   10.44 @@ -380,7 +380,7 @@ ia64_fault (unsigned long vector, unsign
   10.45  		 * the lfetch.
   10.46  		 */
   10.47  		ia64_psr(regs)->ed = 1;
   10.48 -		printf("ia64_fault: handled lfetch.fault\n");
   10.49 +		printk("ia64_fault: handled lfetch.fault\n");
   10.50  		return;
   10.51  	}
   10.52  
   10.53 @@ -429,7 +429,7 @@ ia64_fault (unsigned long vector, unsign
   10.54  			       regs->cr_iip + ia64_psr(regs)->ri,
   10.55  			       regs->pr);
   10.56  # endif
   10.57 -			printf("ia64_fault: returning on hazard\n");
   10.58 +			printk("ia64_fault: returning on hazard\n");
   10.59  			return;
   10.60  		}
   10.61  		break;
   10.62 @@ -588,7 +588,7 @@ ia64_handle_reflection (unsigned long if
   10.63  		if (((isr >> 4L) & 0xfL) == 1) {
   10.64  			/* Fault is due to a register NaT consumption fault. */
   10.65  			//regs->eml_unat = 0;  FIXME: DO WE NEED THIS??
   10.66 -			printf("ia64_handle_reflection: handling regNaT fault\n");
   10.67 +			printk("ia64_handle_reflection: handling regNaT fault\n");
   10.68  			vector = IA64_NAT_CONSUMPTION_VECTOR; break;
   10.69  		}
   10.70  #if 1
   10.71 @@ -601,20 +601,20 @@ ia64_handle_reflection (unsigned long if
   10.72  #ifdef CONFIG_PRIVIFY
   10.73  		/* Some privified operations are coded using reg+64 instead
   10.74  		   of reg.  */
   10.75 -		printf("*** NaT fault... attempting to handle as privop\n");
   10.76 -		printf("isr=%016lx, ifa=%016lx, iip=%016lx, ipsr=%016lx\n",
   10.77 +		printk("*** NaT fault... attempting to handle as privop\n");
   10.78 +		printk("isr=%016lx, ifa=%016lx, iip=%016lx, ipsr=%016lx\n",
   10.79  		       isr, ifa, regs->cr_iip, psr);
   10.80  		//regs->eml_unat = 0;  FIXME: DO WE NEED THIS???
   10.81  		// certain NaT faults are higher priority than privop faults
   10.82  		vector = priv_emulate(v,regs,isr);
   10.83  		if (vector == IA64_NO_FAULT) {
   10.84 -			printf("*** Handled privop masquerading as NaT fault\n");
   10.85 +			printk("*** Handled privop masquerading as NaT fault\n");
   10.86  			return;
   10.87  		}
   10.88  #endif
   10.89  		vector = IA64_NAT_CONSUMPTION_VECTOR; break;
   10.90  	    case 27:
   10.91 -		//printf("*** Handled speculation vector, itc=%lx!\n",ia64_get_itc());
   10.92 +		//printk("*** Handled speculation vector, itc=%lx!\n",ia64_get_itc());
   10.93  		PSCB(current,iim) = iim;
   10.94  		vector = IA64_SPECULATION_VECTOR; break;
   10.95  	    case 30:
   10.96 @@ -629,7 +629,7 @@ ia64_handle_reflection (unsigned long if
   10.97  		// fetch code fail
   10.98  		if (IA64_RETRY == status)
   10.99  			return;
  10.100 -		printf("ia64_handle_reflection: handling FP fault\n");
  10.101 +		printk("ia64_handle_reflection: handling FP fault\n");
  10.102  		vector = IA64_FP_FAULT_VECTOR; break;
  10.103  	    case 33:
  10.104  		status = handle_fpu_swa(0, regs, isr);
  10.105 @@ -638,20 +638,20 @@ ia64_handle_reflection (unsigned long if
  10.106  		// fetch code fail
  10.107  		if (IA64_RETRY == status)
  10.108  			return;
  10.109 -		printf("ia64_handle_reflection: handling FP trap\n");
  10.110 +		printk("ia64_handle_reflection: handling FP trap\n");
  10.111  		vector = IA64_FP_TRAP_VECTOR; break;
  10.112  	    case 34:
  10.113 -		printf("ia64_handle_reflection: handling lowerpriv trap\n");
  10.114 +		printk("ia64_handle_reflection: handling lowerpriv trap\n");
  10.115  		vector = IA64_LOWERPRIV_TRANSFER_TRAP_VECTOR; break;
  10.116  	    case 35:
  10.117 -		printf("ia64_handle_reflection: handling taken branch trap\n");
  10.118 +		printk("ia64_handle_reflection: handling taken branch trap\n");
  10.119  		vector = IA64_TAKEN_BRANCH_TRAP_VECTOR; break;
  10.120  	    case 36:
  10.121 -		printf("ia64_handle_reflection: handling single step trap\n");
  10.122 +		printk("ia64_handle_reflection: handling single step trap\n");
  10.123  		vector = IA64_SINGLE_STEP_TRAP_VECTOR; break;
  10.124  
  10.125  	    default:
  10.126 -		printf("ia64_handle_reflection: unhandled vector=0x%lx\n",vector);
  10.127 +		printk("ia64_handle_reflection: unhandled vector=0x%lx\n",vector);
  10.128  		while(vector);
  10.129  		return;
  10.130  	}
    11.1 --- a/xen/arch/ia64/xen/fw_emul.c	Mon Oct 23 14:19:14 2006 +0100
    11.2 +++ b/xen/arch/ia64/xen/fw_emul.c	Mon Oct 23 14:42:52 2006 +0100
    11.3 @@ -73,20 +73,20 @@ sal_emulator (long index, unsigned long 
    11.4  			r9 = value;
    11.5  		}
    11.6  		else
    11.7 -		     printf("NON-PRIV DOMAIN CALLED SAL_PCI_CONFIG_READ\n");
    11.8 +		     printk("NON-PRIV DOMAIN CALLED SAL_PCI_CONFIG_READ\n");
    11.9  		break;
   11.10  	    case SAL_PCI_CONFIG_WRITE:
   11.11  		if (current->domain == dom0) {
   11.12  			if (((in1 & ~0xffffffffUL) && (in4 == 0)) ||
   11.13  			    (in4 > 1) ||
   11.14  			    (in2 > 8) || (in2 & (in2-1)))
   11.15 -				printf("*** SAL_PCI_CONF_WRITE?!?(adr=0x%lx,typ=0x%lx,sz=0x%lx,val=0x%lx)\n",
   11.16 +				printk("*** SAL_PCI_CONF_WRITE?!?(adr=0x%lx,typ=0x%lx,sz=0x%lx,val=0x%lx)\n",
   11.17  					in1,in4,in2,in3);
   11.18  			// note that args are in a different order!!
   11.19  			status = ia64_sal_pci_config_write(in1,in4,in2,in3);
   11.20  		}
   11.21  		else
   11.22 -		     printf("NON-PRIV DOMAIN CALLED SAL_PCI_CONFIG_WRITE\n");
   11.23 +		     printk("NON-PRIV DOMAIN CALLED SAL_PCI_CONFIG_WRITE\n");
   11.24  		break;
   11.25  	    case SAL_SET_VECTORS:
   11.26   		if (in1 == SAL_VECTOR_OS_BOOT_RENDEZ) {
   11.27 @@ -102,7 +102,7 @@ sal_emulator (long index, unsigned long 
   11.28  			}
   11.29   		}
   11.30   		else
   11.31 - 			printf("*** CALLED SAL_SET_VECTORS %lu.  IGNORED...\n",
   11.32 + 			printk("*** CALLED SAL_SET_VECTORS %lu.  IGNORED...\n",
   11.33   			       in1);
   11.34  		break;
   11.35  	    case SAL_GET_STATE_INFO:
   11.36 @@ -119,10 +119,10 @@ sal_emulator (long index, unsigned long 
   11.37  		/* Noop.  */
   11.38  		break;
   11.39  	    case SAL_MC_RENDEZ:
   11.40 -		printf("*** CALLED SAL_MC_RENDEZ.  IGNORED...\n");
   11.41 +		printk("*** CALLED SAL_MC_RENDEZ.  IGNORED...\n");
   11.42  		break;
   11.43  	    case SAL_MC_SET_PARAMS:
   11.44 -		printf("*** CALLED SAL_MC_SET_PARAMS.  IGNORED...\n");
   11.45 +		printk("*** CALLED SAL_MC_SET_PARAMS.  IGNORED...\n");
   11.46  		break;
   11.47  	    case SAL_CACHE_FLUSH:
   11.48  		if (1) {
   11.49 @@ -139,13 +139,13 @@ sal_emulator (long index, unsigned long 
   11.50  		}
   11.51  		break;
   11.52  	    case SAL_CACHE_INIT:
   11.53 -		printf("*** CALLED SAL_CACHE_INIT.  IGNORED...\n");
   11.54 +		printk("*** CALLED SAL_CACHE_INIT.  IGNORED...\n");
   11.55  		break;
   11.56  	    case SAL_UPDATE_PAL:
   11.57 -		printf("*** CALLED SAL_UPDATE_PAL.  IGNORED...\n");
   11.58 +		printk("*** CALLED SAL_UPDATE_PAL.  IGNORED...\n");
   11.59  		break;
   11.60  	    default:
   11.61 -		printf("*** CALLED SAL_ WITH UNKNOWN INDEX.  IGNORED...\n");
   11.62 +		printk("*** CALLED SAL_ WITH UNKNOWN INDEX.  IGNORED...\n");
   11.63  		status = -1;
   11.64  		break;
   11.65  	}
   11.66 @@ -344,7 +344,7 @@ xen_pal_emulator(unsigned long index, u6
   11.67  		break;
   11.68  	    case PAL_HALT:
   11.69  		    if (current->domain == dom0) {
   11.70 -			    printf ("Domain0 halts the machine\n");
   11.71 +			    printk ("Domain0 halts the machine\n");
   11.72  			    console_start_sync();
   11.73  			    (*efi.reset_system)(EFI_RESET_SHUTDOWN,0,0,NULL);
   11.74  		    }
   11.75 @@ -400,7 +400,7 @@ efi_emulate_get_time(
   11.76  	struct page_info *tc_page = NULL;
   11.77  	efi_status_t status = 0;
   11.78  
   11.79 -	//printf("efi_get_time(%016lx,%016lx) called\n", tv_addr, tc_addr);
   11.80 +	//printk("efi_get_time(%016lx,%016lx) called\n", tv_addr, tc_addr);
   11.81  	tv = efi_translate_domain_addr(tv_addr, fault, &tv_page);
   11.82  	if (*fault != IA64_NO_FAULT)
   11.83  		goto errout;
   11.84 @@ -410,9 +410,9 @@ efi_emulate_get_time(
   11.85  			goto errout;
   11.86  	}
   11.87  
   11.88 -	//printf("efi_get_time(%016lx,%016lx) translated to xen virtual address\n", tv, tc);
   11.89 +	//printk("efi_get_time(%016lx,%016lx) translated to xen virtual address\n", tv, tc);
   11.90  	status = (*efi.get_time)((efi_time_t *) tv, (efi_time_cap_t *) tc);
   11.91 -	//printf("efi_get_time returns %lx\n", status);
   11.92 +	//printk("efi_get_time returns %lx\n", status);
   11.93  
   11.94  errout:
   11.95  	if (tc_page != NULL)
   11.96 @@ -666,14 +666,14 @@ efi_emulate_set_virtual_address_map(
   11.97  	fpswa_interface_t *fpswa_inf = d->arch.fpswa_inf;
   11.98  
   11.99  	if (descriptor_version != EFI_MEMDESC_VERSION) {
  11.100 -		printf ("efi_emulate_set_virtual_address_map: memory "
  11.101 +		printk ("efi_emulate_set_virtual_address_map: memory "
  11.102  		        "descriptor version unmatched (%d vs %d)\n",
  11.103  		        (int)descriptor_version, EFI_MEMDESC_VERSION);
  11.104  		return EFI_INVALID_PARAMETER;
  11.105  	}
  11.106  
  11.107  	if (descriptor_size != sizeof(efi_memory_desc_t)) {
  11.108 -		printf ("efi_emulate_set_virtual_address_map: memory descriptor size unmatched\n");
  11.109 +		printk ("efi_emulate_set_virtual_address_map: memory descriptor size unmatched\n");
  11.110  		return EFI_INVALID_PARAMETER;
  11.111  	}
  11.112  
  11.113 @@ -686,7 +686,7 @@ efi_emulate_set_virtual_address_map(
  11.114  
  11.115  	for (p = efi_map_start; p < efi_map_end; p += efi_desc_size) {
  11.116  		if (copy_from_user(&entry, p, sizeof(efi_memory_desc_t))) {
  11.117 -			printf ("efi_emulate_set_virtual_address_map: copy_from_user() fault. addr=0x%p\n", p);
  11.118 +			printk ("efi_emulate_set_virtual_address_map: copy_from_user() fault. addr=0x%p\n", p);
  11.119  			return EFI_UNSUPPORTED;
  11.120  		}
  11.121  
  11.122 @@ -814,7 +814,7 @@ efi_emulator (struct pt_regs *regs, IA64
  11.123  		status = EFI_UNSUPPORTED;
  11.124  		break;
  11.125  	    default:
  11.126 -		printf("unknown ia64 fw hypercall %lx\n", regs->r2);
  11.127 +		printk("unknown ia64 fw hypercall %lx\n", regs->r2);
  11.128  		status = EFI_UNSUPPORTED;
  11.129  	}
  11.130  
  11.131 @@ -835,7 +835,7 @@ do_ssc(unsigned long ssc, struct pt_regs
  11.132  	    case SSC_PUTCHAR:
  11.133  		buf[0] = arg0;
  11.134  		buf[1] = '\0';
  11.135 -		printf(buf);
  11.136 +		printk(buf);
  11.137  		break;
  11.138  	    case SSC_GETCHAR:
  11.139  		retval = ia64_ssc(0,0,0,0,ssc);
  11.140 @@ -848,7 +848,7 @@ do_ssc(unsigned long ssc, struct pt_regs
  11.141  /**/			stat = (struct ssc_disk_stat *)__va(arg0);
  11.142  ///**/			if (stat->fd == last_fd) stat->count = last_count;
  11.143  /**/			stat->count = last_count;
  11.144 -//if (last_count >= PAGE_SIZE) printf("ssc_wait: stat->fd=%d,last_fd=%d,last_count=%d\n",stat->fd,last_fd,last_count);
  11.145 +//if (last_count >= PAGE_SIZE) printk("ssc_wait: stat->fd=%d,last_fd=%d,last_count=%d\n",stat->fd,last_fd,last_count);
  11.146  ///**/			retval = ia64_ssc(arg0,0,0,0,ssc);
  11.147  /**/			retval = 0;
  11.148  		}
  11.149 @@ -857,7 +857,7 @@ do_ssc(unsigned long ssc, struct pt_regs
  11.150  		break;
  11.151  	    case SSC_OPEN:
  11.152  		arg1 = vcpu_get_gr(current,33);	// access rights
  11.153 -if (!running_on_sim) { printf("SSC_OPEN, not implemented on hardware.  (ignoring...)\n"); arg0 = 0; }
  11.154 +if (!running_on_sim) { printk("SSC_OPEN, not implemented on hardware.  (ignoring...)\n"); arg0 = 0; }
  11.155  		if (arg0) {	// metaphysical address
  11.156  			arg0 = translate_domain_mpaddr(arg0, NULL);
  11.157  			retval = ia64_ssc(arg0,arg1,0,0,ssc);
  11.158 @@ -867,7 +867,7 @@ if (!running_on_sim) { printf("SSC_OPEN,
  11.159  		break;
  11.160  	    case SSC_WRITE:
  11.161  	    case SSC_READ:
  11.162 -//if (ssc == SSC_WRITE) printf("DOING AN SSC_WRITE\n");
  11.163 +//if (ssc == SSC_WRITE) printk("DOING AN SSC_WRITE\n");
  11.164  		arg1 = vcpu_get_gr(current,33);
  11.165  		arg2 = vcpu_get_gr(current,34);
  11.166  		arg3 = vcpu_get_gr(current,35);
  11.167 @@ -883,7 +883,7 @@ if (!running_on_sim) { printf("SSC_OPEN,
  11.168  /**/			last_fd = arg1;
  11.169  /**/			last_count = len;
  11.170  			mpaddr = req->addr;
  11.171 -//if (last_count >= PAGE_SIZE) printf("do_ssc: read fd=%d, addr=%p, len=%lx ",last_fd,mpaddr,len);
  11.172 +//if (last_count >= PAGE_SIZE) printk("do_ssc: read fd=%d, addr=%p, len=%lx ",last_fd,mpaddr,len);
  11.173  			retval = 0;
  11.174  			if ((mpaddr & PAGE_MASK) != ((mpaddr+len-1) & PAGE_MASK)) {
  11.175  				// do partial page first
  11.176 @@ -894,7 +894,7 @@ if (!running_on_sim) { printf("SSC_OPEN,
  11.177  				arg3 += req->len; // file offset
  11.178  /**/				last_stat.fd = last_fd;
  11.179  /**/				(void)ia64_ssc(__pa(&last_stat),0,0,0,SSC_WAIT_COMPLETION);
  11.180 -//if (last_count >= PAGE_SIZE) printf("ssc(%p,%lx)[part]=%x ",req->addr,req->len,retval);
  11.181 +//if (last_count >= PAGE_SIZE) printk("ssc(%p,%lx)[part]=%x ",req->addr,req->len,retval);
  11.182  			}
  11.183  			if (retval >= 0) while (len > 0) {
  11.184  				req->addr = translate_domain_mpaddr(mpaddr, NULL);
  11.185 @@ -905,27 +905,27 @@ if (!running_on_sim) { printf("SSC_OPEN,
  11.186  // TEMP REMOVED AGAIN				arg3 += req->len; // file offset
  11.187  /**/				last_stat.fd = last_fd;
  11.188  /**/				(void)ia64_ssc(__pa(&last_stat),0,0,0,SSC_WAIT_COMPLETION);
  11.189 -//if (last_count >= PAGE_SIZE) printf("ssc(%p,%lx)=%x ",req->addr,req->len,retval);
  11.190 +//if (last_count >= PAGE_SIZE) printk("ssc(%p,%lx)=%x ",req->addr,req->len,retval);
  11.191  			}
  11.192  			// set it back to the original value
  11.193  			req->len = last_count;
  11.194  		}
  11.195  		else retval = -1L;
  11.196  		vcpu_set_gr(current,8,retval,0);
  11.197 -//if (last_count >= PAGE_SIZE) printf("retval=%x\n",retval);
  11.198 +//if (last_count >= PAGE_SIZE) printk("retval=%x\n",retval);
  11.199  		break;
  11.200  	    case SSC_CONNECT_INTERRUPT:
  11.201  		arg1 = vcpu_get_gr(current,33);
  11.202  		arg2 = vcpu_get_gr(current,34);
  11.203  		arg3 = vcpu_get_gr(current,35);
  11.204 -		if (!running_on_sim) { printf("SSC_CONNECT_INTERRUPT, not implemented on hardware.  (ignoring...)\n"); break; }
  11.205 +		if (!running_on_sim) { printk("SSC_CONNECT_INTERRUPT, not implemented on hardware.  (ignoring...)\n"); break; }
  11.206  		(void)ia64_ssc(arg0,arg1,arg2,arg3,ssc);
  11.207  		break;
  11.208  	    case SSC_NETDEV_PROBE:
  11.209  		vcpu_set_gr(current,8,-1L,0);
  11.210  		break;
  11.211  	    default:
  11.212 -		printf("ia64_handle_break: bad ssc code %lx, iip=0x%lx, b0=0x%lx... spinning\n",
  11.213 +		printk("ia64_handle_break: bad ssc code %lx, iip=0x%lx, b0=0x%lx... spinning\n",
  11.214  			ssc, regs->cr_iip, regs->b0);
  11.215  		while(1);
  11.216  		break;
    12.1 --- a/xen/arch/ia64/xen/hypercall.c	Mon Oct 23 14:19:14 2006 +0100
    12.2 +++ b/xen/arch/ia64/xen/hypercall.c	Mon Oct 23 14:42:52 2006 +0100
    12.3 @@ -163,7 +163,7 @@ fw_hypercall_ipi (struct pt_regs *regs)
    12.4  			memset (&c, 0, sizeof (c));
    12.5  
    12.6  			if (arch_set_info_guest (targ, &c) != 0) {
    12.7 -				printf ("arch_boot_vcpu: failure\n");
    12.8 +				printk ("arch_boot_vcpu: failure\n");
    12.9  				return;
   12.10  			}
   12.11  		}
   12.12 @@ -177,11 +177,11 @@ fw_hypercall_ipi (struct pt_regs *regs)
   12.13  		if (test_and_clear_bit(_VCPUF_down,
   12.14  				       &targ->vcpu_flags)) {
   12.15  			vcpu_wake(targ);
   12.16 -			printf ("arch_boot_vcpu: vcpu %d awaken\n",
   12.17 +			printk ("arch_boot_vcpu: vcpu %d awaken\n",
   12.18  				targ->vcpu_id);
   12.19  		}
   12.20  		else
   12.21 -			printf ("arch_boot_vcpu: huu, already awaken!\n");
   12.22 +			printk ("arch_boot_vcpu: huu, already awaken!\n");
   12.23  	}
   12.24  	else {
   12.25  		int running = test_bit(_VCPUF_running,
   12.26 @@ -214,7 +214,7 @@ fw_hypercall (struct pt_regs *regs)
   12.27  	perfc_incra(fw_hypercall, index >> 8);
   12.28  	switch (index) {
   12.29  	    case FW_HYPERCALL_PAL_CALL:
   12.30 -		//printf("*** PAL hypercall: index=%d\n",regs->r28);
   12.31 +		//printk("*** PAL hypercall: index=%d\n",regs->r28);
   12.32  		//FIXME: This should call a C routine
   12.33  #if 0
   12.34  		// This is very conservative, but avoids a possible
   12.35 @@ -229,7 +229,7 @@ fw_hypercall (struct pt_regs *regs)
   12.36  				event_pending(v)) {
   12.37  				perfc_incrc(idle_when_pending);
   12.38  				vcpu_pend_unspecified_interrupt(v);
   12.39 -//printf("idle w/int#%d pending!\n",pi);
   12.40 +//printk("idle w/int#%d pending!\n",pi);
   12.41  //this shouldn't happen, but it apparently does quite a bit!  so don't
   12.42  //allow it to happen... i.e. if a domain has an interrupt pending and
   12.43  //it tries to halt itself because it thinks it is idle, just return here
   12.44 @@ -295,7 +295,7 @@ fw_hypercall (struct pt_regs *regs)
   12.45  		regs->r11 = fpswa_ret.err2;
   12.46  		break;
   12.47  	    default:
   12.48 -		printf("unknown ia64 fw hypercall %lx\n", regs->r2);
   12.49 +		printk("unknown ia64 fw hypercall %lx\n", regs->r2);
   12.50  		regs->r8 = do_ni_hypercall();
   12.51  	}
   12.52  	return IA64_NO_FAULT;
    13.1 --- a/xen/arch/ia64/xen/hyperprivop.S	Mon Oct 23 14:19:14 2006 +0100
    13.2 +++ b/xen/arch/ia64/xen/hyperprivop.S	Mon Oct 23 14:42:52 2006 +0100
    13.3 @@ -203,7 +203,7 @@ END(fast_hyperprivop)
    13.4  
    13.5  // give up for now if: ipsr.be==1, ipsr.pp==1
    13.6  // from reflect_interruption, don't need to:
    13.7 -//  - printf first extint (debug only)
    13.8 +//  - printk first extint (debug only)
    13.9  //  - check for interrupt collection enabled (routine will force on)
   13.10  //  - set ifa (not valid for extint)
   13.11  //  - set iha (not valid for extint)
    14.1 --- a/xen/arch/ia64/xen/irq.c	Mon Oct 23 14:19:14 2006 +0100
    14.2 +++ b/xen/arch/ia64/xen/irq.c	Mon Oct 23 14:42:52 2006 +0100
    14.3 @@ -481,7 +481,7 @@ xen_debug_irq(unsigned long vector, stru
    14.4  		firstirq = 0;
    14.5  	}
    14.6  	if (firsttime[vector]) {
    14.7 -		printf("**** (entry) First received int on vector=%lu,itc=%lx\n",
    14.8 +		printk("**** (entry) First received int on vector=%lu,itc=%lx\n",
    14.9  			(unsigned long) vector, ia64_get_itc());
   14.10  		firsttime[vector] = 0;
   14.11  	}
    15.1 --- a/xen/arch/ia64/xen/mm.c	Mon Oct 23 14:19:14 2006 +0100
    15.2 +++ b/xen/arch/ia64/xen/mm.c	Mon Oct 23 14:42:52 2006 +0100
    15.3 @@ -460,7 +460,7 @@ u64 translate_domain_pte(u64 pteval, u64
    15.4  			   This can happen when domU tries to touch i/o
    15.5  			   port space.  Also prevents possible address
    15.6  			   aliasing issues.  */
    15.7 -			printf("Warning: UC to WB for mpaddr=%lx\n", mpaddr);
    15.8 +			printk("Warning: UC to WB for mpaddr=%lx\n", mpaddr);
    15.9  			pteval = (pteval & ~_PAGE_MA_MASK) | _PAGE_MA_WB;
   15.10  		}
   15.11  		break;
   15.12 @@ -715,7 +715,7 @@ static struct page_info *
   15.13  
   15.14      p = alloc_domheap_page(d);
   15.15      if (unlikely(!p)) {
   15.16 -        printf("assign_new_domain_page: Can't alloc!!!! Aaaargh!\n");
   15.17 +        printk("assign_new_domain_page: Can't alloc!!!! Aaaargh!\n");
   15.18          return(p);
   15.19      }
   15.20  
   15.21 @@ -726,7 +726,7 @@ static struct page_info *
   15.22                   && maddr < __get_cpu_var(vhpt_pend))) {
   15.23          /* FIXME: how can this happen ?
   15.24             vhpt is allocated by alloc_domheap_page.  */
   15.25 -        printf("assign_new_domain_page: reassigned vhpt page %lx!!\n",
   15.26 +        printk("assign_new_domain_page: reassigned vhpt page %lx!!\n",
   15.27                 maddr);
   15.28      }
   15.29  
   15.30 @@ -1536,7 +1536,7 @@ void domain_cache_flush (struct domain *
   15.31              }
   15.32          }
   15.33      }
   15.34 -    //printf ("domain_cache_flush: %d %d pages\n", d->domain_id, nbr_page);
   15.35 +    //printk ("domain_cache_flush: %d %d pages\n", d->domain_id, nbr_page);
   15.36  }
   15.37  
   15.38  #ifdef VERBOSE
    16.1 --- a/xen/arch/ia64/xen/privop.c	Mon Oct 23 14:19:14 2006 +0100
    16.2 +++ b/xen/arch/ia64/xen/privop.c	Mon Oct 23 14:42:52 2006 +0100
    16.3 @@ -525,14 +525,14 @@ priv_handle_op(VCPU *vcpu, REGS *regs, i
    16.4  	if (iip==0xa000000100001820) {
    16.5  		static int firstpagefault = 1;
    16.6  		if (firstpagefault) {
    16.7 -			printf("*** First time to domain page fault!\n");				firstpagefault=0;
    16.8 +			printk("*** First time to domain page fault!\n");				firstpagefault=0;
    16.9  		}
   16.10  	}
   16.11  #endif
   16.12  	if (privop_trace) {
   16.13  		static long i = 400;
   16.14 -		//if (i > 0) printf("priv_handle_op: at 0x%lx\n",iip);
   16.15 -		if (i > 0) printf("priv_handle_op: privop trace at 0x%lx, itc=%lx, itm=%lx\n",
   16.16 +		//if (i > 0) printk("priv_handle_op: at 0x%lx\n",iip);
   16.17 +		if (i > 0) printk("priv_handle_op: privop trace at 0x%lx, itc=%lx, itm=%lx\n",
   16.18  			iip,ia64_get_itc(),ia64_get_itm());
   16.19  		i--;
   16.20  	}
   16.21 @@ -541,11 +541,11 @@ priv_handle_op(VCPU *vcpu, REGS *regs, i
   16.22  	else if (slot == 1)
   16.23  		inst.inst = ((bundle.i64[0]>>46) | bundle.i64[1]<<18) & MASK_41;
   16.24  	else if (slot == 2) inst.inst = (bundle.i64[1]>>23) & MASK_41; 
   16.25 -	else printf("priv_handle_op: illegal slot: %d\n", slot);
   16.26 +	else printk("priv_handle_op: illegal slot: %d\n", slot);
   16.27  
   16.28  	slot_type = slot_types[bundle.template][slot];
   16.29  	if (priv_verbose) {
   16.30 -		printf("priv_handle_op: checking bundle at 0x%lx (op=0x%016lx) slot %d (type=%d)\n",
   16.31 +		printk("priv_handle_op: checking bundle at 0x%lx (op=0x%016lx) slot %d (type=%d)\n",
   16.32  		 iip, (UINT64)inst.inst, slot, slot_type);
   16.33  	}
   16.34  	if (slot_type == B && inst.generic.major == 0 && inst.B8.x6 == 0x0) {
   16.35 @@ -648,10 +648,10 @@ priv_handle_op(VCPU *vcpu, REGS *regs, i
   16.36  	    default:
   16.37  		break;
   16.38  	}
   16.39 -        //printf("We who are about do die salute you\n");
   16.40 -	printf("priv_handle_op: can't handle privop at 0x%lx (op=0x%016lx) slot %d (type=%d), ipsr=0x%lx\n",
   16.41 +        //printk("We who are about do die salute you\n");
   16.42 +	printk("priv_handle_op: can't handle privop at 0x%lx (op=0x%016lx) slot %d (type=%d), ipsr=0x%lx\n",
   16.43  		 iip, (UINT64)inst.inst, slot, slot_type, ipsr);
   16.44 -        //printf("vtop(0x%lx)==0x%lx\n", iip, tr_vtop(iip));
   16.45 +        //printk("vtop(0x%lx)==0x%lx\n", iip, tr_vtop(iip));
   16.46          //thread_mozambique("privop fault\n");
   16.47  	return (IA64_ILLOP_FAULT);
   16.48  }
   16.49 @@ -676,8 +676,8 @@ priv_emulate(VCPU *vcpu, REGS *regs, UIN
   16.50  
   16.51  	// handle privops masked as illops? and breaks (6)
   16.52  	if (isrcode != 1 && isrcode != 2 && isrcode != 0 && isrcode != 6) {
   16.53 -        	printf("priv_emulate: isrcode != 0 or 1 or 2\n");
   16.54 -		printf("priv_emulate: returning ILLOP, not implemented!\n");
   16.55 +        	printk("priv_emulate: isrcode != 0 or 1 or 2\n");
   16.56 +		printk("priv_emulate: returning ILLOP, not implemented!\n");
   16.57  		while (1);
   16.58  		return IA64_ILLOP_FAULT;
   16.59  	}
   16.60 @@ -690,7 +690,7 @@ priv_emulate(VCPU *vcpu, REGS *regs, UIN
   16.61  		(void)vcpu_increment_iip(vcpu);
   16.62  	}
   16.63  	if (fault == IA64_ILLOP_FAULT)
   16.64 -		printf("priv_emulate: priv_handle_op fails, "
   16.65 +		printk("priv_emulate: priv_handle_op fails, "
   16.66  		       "isr=0x%lx iip=%lx\n",isr, regs->cr_iip);
   16.67  	return fault;
   16.68  }
    17.1 --- a/xen/arch/ia64/xen/regionreg.c	Mon Oct 23 14:19:14 2006 +0100
    17.2 +++ b/xen/arch/ia64/xen/regionreg.c	Mon Oct 23 14:42:52 2006 +0100
    17.3 @@ -106,7 +106,7 @@ void init_rid_allocator (void)
    17.4  	/* Due to RID mangling, we expect 24 RID bits!
    17.5  	   This test should be removed if RID mangling is removed/modified.  */
    17.6  	if (implemented_rid_bits != 24) {
    17.7 -		printf ("RID mangling expected 24 RID bits, got only %d!\n",
    17.8 +		printk ("RID mangling expected 24 RID bits, got only %d!\n",
    17.9  			implemented_rid_bits);
   17.10  		BUG();
   17.11  	}
   17.12 @@ -117,14 +117,14 @@ void init_rid_allocator (void)
   17.13  
   17.14  	/* Check for too small values.  */
   17.15  	if (domain_rid_bits_default < IA64_MIN_IMPL_RID_BITS) {
   17.16 -		printf ("Default domain rid bits %d is too small, use %d\n",
   17.17 +		printk ("Default domain rid bits %d is too small, use %d\n",
   17.18  			domain_rid_bits_default, IA64_MIN_IMPL_RID_BITS);
   17.19  		domain_rid_bits_default = IA64_MIN_IMPL_RID_BITS;
   17.20  	}
   17.21  
   17.22  	log_blocks = (implemented_rid_bits - IA64_MIN_IMPL_RID_BITS);
   17.23  
   17.24 -	printf ("Maximum number of domains: %d; %d RID bits per domain\n",
   17.25 +	printk ("Maximum number of domains: %d; %d RID bits per domain\n",
   17.26  		(1 << (implemented_rid_bits - domain_rid_bits_default)) - 1,
   17.27  		domain_rid_bits_default);
   17.28  	
   17.29 @@ -185,7 +185,7 @@ int allocate_rid_range(struct domain *d,
   17.30  	d->arch.metaphysical_rr0 = allocate_metaphysical_rr(d, 0);
   17.31  	d->arch.metaphysical_rr4 = allocate_metaphysical_rr(d, 1);
   17.32  
   17.33 -	printf("### domain %p: rid=%x-%x mp_rid=%x\n",
   17.34 +	printk("### domain %p: rid=%x-%x mp_rid=%x\n",
   17.35  	       d, d->arch.starting_rid, d->arch.ending_rid,
   17.36  	       d->arch.starting_mp_rid);
   17.37  	
    18.1 --- a/xen/arch/ia64/xen/vcpu.c	Mon Oct 23 14:19:14 2006 +0100
    18.2 +++ b/xen/arch/ia64/xen/vcpu.c	Mon Oct 23 14:42:52 2006 +0100
    18.3 @@ -189,7 +189,7 @@ IA64FAULT vcpu_set_ar(VCPU *vcpu, UINT64
    18.4  	if (reg == 44) return (vcpu_set_itc(vcpu,val));
    18.5  	else if (reg == 27) return (IA64_ILLOP_FAULT);
    18.6  	else if (reg == 24)
    18.7 -	    printf("warning: setting ar.eflg is a no-op; no IA-32 support\n");
    18.8 +	    printk("warning: setting ar.eflg is a no-op; no IA-32 support\n");
    18.9  	else if (reg > 7) return (IA64_ILLOP_FAULT);
   18.10  	else {
   18.11  		PSCB(vcpu,krs[reg]) = val;
   18.12 @@ -201,7 +201,7 @@ IA64FAULT vcpu_set_ar(VCPU *vcpu, UINT64
   18.13  IA64FAULT vcpu_get_ar(VCPU *vcpu, UINT64 reg, UINT64 *val)
   18.14  {
   18.15  	if (reg == 24)
   18.16 -	    printf("warning: getting ar.eflg is a no-op; no IA-32 support\n");
   18.17 +	    printk("warning: getting ar.eflg is a no-op; no IA-32 support\n");
   18.18  	else if (reg > 7) return (IA64_ILLOP_FAULT);
   18.19  	else *val = PSCB(vcpu,krs[reg]);
   18.20  	return IA64_NO_FAULT;
   18.21 @@ -304,7 +304,7 @@ IA64FAULT vcpu_set_psr_sm(VCPU *vcpu, UI
   18.22  	if (imm.sp) { ipsr->sp = 1; psr.sp = 1; }
   18.23  	if (imm.i) {
   18.24  		if (vcpu->vcpu_info->evtchn_upcall_mask) {
   18.25 -//printf("vcpu_set_psr_sm: psr.ic 0->1\n");
   18.26 +//printk("vcpu_set_psr_sm: psr.ic 0->1\n");
   18.27  			enabling_interrupts = 1;
   18.28  		}
   18.29  		vcpu->vcpu_info->evtchn_upcall_mask = 0;
   18.30 @@ -316,7 +316,7 @@ IA64FAULT vcpu_set_psr_sm(VCPU *vcpu, UI
   18.31  	if (imm.ac) { ipsr->ac = 1; psr.ac = 1; }
   18.32  	if (imm.up) { ipsr->up = 1; psr.up = 1; }
   18.33  	if (imm.be) {
   18.34 -		printf("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
   18.35 +		printk("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
   18.36  		return (IA64_ILLOP_FAULT);
   18.37  	}
   18.38  	if (imm.dt) vcpu_set_metaphysical_mode(vcpu,FALSE);
   18.39 @@ -365,7 +365,7 @@ IA64FAULT vcpu_set_psr_l(VCPU *vcpu, UIN
   18.40  	if (newpsr.dt && newpsr.rt) vcpu_set_metaphysical_mode(vcpu,FALSE);
   18.41  	else vcpu_set_metaphysical_mode(vcpu,TRUE);
   18.42  	if (newpsr.be) {
   18.43 -		printf("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
   18.44 +		printk("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
   18.45  		return (IA64_ILLOP_FAULT);
   18.46  	}
   18.47  	if (enabling_interrupts &&
   18.48 @@ -408,7 +408,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcp
   18.49  	UINT64 dcr = PSCBX(vcpu,dcr);
   18.50  	PSR psr;
   18.51  
   18.52 -	//printf("*** vcpu_get_ipsr_int_state (0x%016lx)...\n",prevpsr);
   18.53 +	//printk("*** vcpu_get_ipsr_int_state (0x%016lx)...\n",prevpsr);
   18.54  	psr.i64 = prevpsr;
   18.55  	psr.ia64_psr.be = 0; if (dcr & IA64_DCR_BE) psr.ia64_psr.be = 1;
   18.56  	psr.ia64_psr.pp = 0; if (dcr & IA64_DCR_PP) psr.ia64_psr.pp = 1;
   18.57 @@ -418,7 +418,7 @@ UINT64 vcpu_get_ipsr_int_state(VCPU *vcp
   18.58  	psr.ia64_psr.dt = 1; psr.ia64_psr.it = 1; psr.ia64_psr.rt = 1;
   18.59  	if (psr.ia64_psr.cpl == 2) psr.ia64_psr.cpl = 0; // !!!! fool domain
   18.60  	// psr.pk = 1;
   18.61 -	//printf("returns 0x%016lx...\n",psr.i64);
   18.62 +	//printk("returns 0x%016lx...\n",psr.i64);
   18.63  	return psr.i64;
   18.64  }
   18.65  
   18.66 @@ -519,7 +519,7 @@ IA64FAULT vcpu_get_iipa(VCPU *vcpu, UINT
   18.67  	UINT64 val = PSCB(vcpu,iipa);
   18.68  	// SP entry code does not save iipa yet nor does it get
   18.69  	//  properly delivered in the pscb
   18.70 -//	printf("*** vcpu_get_iipa: cr.iipa not fully implemented yet!!\n");
   18.71 +//	printk("*** vcpu_get_iipa: cr.iipa not fully implemented yet!!\n");
   18.72  	*pval = val;
   18.73  	return (IA64_NO_FAULT);
   18.74  }
   18.75 @@ -570,7 +570,7 @@ IA64FAULT vcpu_set_iva(VCPU *vcpu, UINT6
   18.76  IA64FAULT vcpu_set_pta(VCPU *vcpu, UINT64 val)
   18.77  {
   18.78  	if (val & IA64_PTA_LFMT) {
   18.79 -		printf("*** No support for VHPT long format yet!!\n");
   18.80 +		printk("*** No support for VHPT long format yet!!\n");
   18.81  		return (IA64_ILLOP_FAULT);
   18.82  	}
   18.83  	if (val & (0x3f<<9)) /* reserved fields */ return IA64_RSVDREG_FAULT;
   18.84 @@ -622,7 +622,7 @@ IA64FAULT vcpu_set_iipa(VCPU *vcpu, UINT
   18.85  {
   18.86  	// SP entry code does not save iipa yet nor does it get
   18.87  	//  properly delivered in the pscb
   18.88 -//	printf("*** vcpu_set_iipa: cr.iipa not fully implemented yet!!\n");
   18.89 +//	printk("*** vcpu_set_iipa: cr.iipa not fully implemented yet!!\n");
   18.90  	PSCB(vcpu,iipa) = val;
   18.91  	return IA64_NO_FAULT;
   18.92  }
   18.93 @@ -658,12 +658,12 @@ void vcpu_pend_unspecified_interrupt(VCP
   18.94  void vcpu_pend_interrupt(VCPU *vcpu, UINT64 vector)
   18.95  {
   18.96  	if (vector & ~0xff) {
   18.97 -		printf("vcpu_pend_interrupt: bad vector\n");
   18.98 +		printk("vcpu_pend_interrupt: bad vector\n");
   18.99  		return;
  18.100  	}
  18.101  
  18.102  	if (vcpu->arch.event_callback_ip) {
  18.103 -		printf("Deprecated interface. Move to new event based solution\n");
  18.104 +		printk("Deprecated interface. Move to new event based solution\n");
  18.105  		return;
  18.106  	}
  18.107  		
  18.108 @@ -718,7 +718,7 @@ check_start:
  18.109  	}
  18.110  	// have a pending,deliverable interrupt... see if it is masked
  18.111  	bitnum = ia64_fls(bits);
  18.112 -//printf("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...\n",bitnum);
  18.113 +//printk("XXXXXXX vcpu_check_pending_interrupts: got bitnum=%p...\n",bitnum);
  18.114  	vector = bitnum+(i*64);
  18.115  	mask = 1L << bitnum;
  18.116  	/* sanity check for guest timer interrupt */
  18.117 @@ -730,24 +730,24 @@ check_start:
  18.118  			goto check_start;
  18.119  		}
  18.120  	}
  18.121 -//printf("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...\n",vector);
  18.122 +//printk("XXXXXXX vcpu_check_pending_interrupts: got vector=%p...\n",vector);
  18.123  	if (*r >= mask) {
  18.124  		// masked by equal inservice
  18.125 -//printf("but masked by equal inservice\n");
  18.126 +//printk("but masked by equal inservice\n");
  18.127  		return SPURIOUS_VECTOR;
  18.128  	}
  18.129  	if (PSCB(vcpu,tpr) & IA64_TPR_MMI) {
  18.130  		// tpr.mmi is set
  18.131 -//printf("but masked by tpr.mmi\n");
  18.132 +//printk("but masked by tpr.mmi\n");
  18.133  		return SPURIOUS_VECTOR;
  18.134  	}
  18.135  	if (((PSCB(vcpu,tpr) & IA64_TPR_MIC) + 15) >= vector) {
  18.136  		//tpr.mic masks class
  18.137 -//printf("but masked by tpr.mic\n");
  18.138 +//printk("but masked by tpr.mic\n");
  18.139  		return SPURIOUS_VECTOR;
  18.140  	}
  18.141  
  18.142 -//printf("returned to caller\n");
  18.143 +//printk("returned to caller\n");
  18.144  	return vector;
  18.145  }
  18.146  
  18.147 @@ -805,7 +805,7 @@ IA64FAULT vcpu_get_ivr(VCPU *vcpu, UINT6
  18.148  #if 0
  18.149  	if (vector == (PSCB(vcpu,itv) & 0xff)) {
  18.150  	    if (!(++count[domid] & ((HEARTBEAT_FREQ*1024)-1))) {
  18.151 -		printf("Dom%d heartbeat... ticks=%lx,nonticks=%lx\n",
  18.152 +		printk("Dom%d heartbeat... ticks=%lx,nonticks=%lx\n",
  18.153  			domid, count[domid], nonclockcount[domid]);
  18.154  		//count[domid] = 0;
  18.155  		//dump_runq();
  18.156 @@ -818,7 +818,7 @@ IA64FAULT vcpu_get_ivr(VCPU *vcpu, UINT6
  18.157  	// getting ivr has "side effects"
  18.158  #ifdef IRQ_DEBUG
  18.159  	if (firsttime[vector]) {
  18.160 -		printf("*** First get_ivr on vector=%lu,itc=%lx\n",
  18.161 +		printk("*** First get_ivr on vector=%lu,itc=%lx\n",
  18.162  			vector,ia64_get_itc());
  18.163  		firsttime[vector]=0;
  18.164  	}
  18.165 @@ -832,7 +832,7 @@ IA64FAULT vcpu_get_ivr(VCPU *vcpu, UINT6
  18.166  
  18.167  	i = vector >> 6;
  18.168  	mask = 1L << (vector & 0x3f);
  18.169 -//printf("ZZZZZZ vcpu_get_ivr: setting insvc mask for vector %lu\n",vector);
  18.170 +//printk("ZZZZZZ vcpu_get_ivr: setting insvc mask for vector %lu\n",vector);
  18.171  	PSCBX(vcpu,insvc[i]) |= mask;
  18.172  	PSCBX(vcpu,irr[i]) &= ~mask;
  18.173  	//PSCB(vcpu,pending_interruption)--;
  18.174 @@ -897,7 +897,7 @@ IA64FAULT vcpu_get_cmcv(VCPU *vcpu, UINT
  18.175  IA64FAULT vcpu_get_lrr0(VCPU *vcpu, UINT64 *pval)
  18.176  {
  18.177  	// fix this when setting values other than m-bit is supported
  18.178 -	printf("vcpu_get_lrr0: Unmasked interrupts unsupported\n");
  18.179 +	printk("vcpu_get_lrr0: Unmasked interrupts unsupported\n");
  18.180  	*pval = (1L << 16);
  18.181  	return (IA64_NO_FAULT);
  18.182  }
  18.183 @@ -905,14 +905,14 @@ IA64FAULT vcpu_get_lrr0(VCPU *vcpu, UINT
  18.184  IA64FAULT vcpu_get_lrr1(VCPU *vcpu, UINT64 *pval)
  18.185  {
  18.186  	// fix this when setting values other than m-bit is supported
  18.187 -	printf("vcpu_get_lrr1: Unmasked interrupts unsupported\n");
  18.188 +	printk("vcpu_get_lrr1: Unmasked interrupts unsupported\n");
  18.189  	*pval = (1L << 16);
  18.190  	return (IA64_NO_FAULT);
  18.191  }
  18.192  
  18.193  IA64FAULT vcpu_set_lid(VCPU *vcpu, UINT64 val)
  18.194  {
  18.195 -	printf("vcpu_set_lid: Setting cr.lid is unsupported\n");
  18.196 +	printk("vcpu_set_lid: Setting cr.lid is unsupported\n");
  18.197  	return (IA64_ILLOP_FAULT);
  18.198  }
  18.199  
  18.200 @@ -934,7 +934,7 @@ IA64FAULT vcpu_set_eoi(VCPU *vcpu, UINT6
  18.201  	p = &PSCBX(vcpu,insvc[3]);
  18.202  	for (i = 3; (i >= 0) && !(bits = *p); i--, p--);
  18.203  	if (i < 0) {
  18.204 -		printf("Trying to EOI interrupt when none are in-service.\n");
  18.205 +		printk("Trying to EOI interrupt when none are in-service.\n");
  18.206  		return IA64_NO_FAULT;
  18.207  	}
  18.208  	bitnum = ia64_fls(bits);
  18.209 @@ -946,18 +946,18 @@ IA64FAULT vcpu_set_eoi(VCPU *vcpu, UINT6
  18.210  	if (!vcpu->vcpu_info->evtchn_upcall_mask) { // but only if enabled...
  18.211  		// worry about this later... Linux only calls eoi
  18.212  		// with interrupts disabled
  18.213 -		printf("Trying to EOI interrupt with interrupts enabled\n");
  18.214 +		printk("Trying to EOI interrupt with interrupts enabled\n");
  18.215  	}
  18.216  	if (vcpu_check_pending_interrupts(vcpu) != SPURIOUS_VECTOR)
  18.217  		PSCB(vcpu,pending_interruption) = 1;
  18.218 -//printf("YYYYY vcpu_set_eoi: Successful\n");
  18.219 +//printk("YYYYY vcpu_set_eoi: Successful\n");
  18.220  	return (IA64_NO_FAULT);
  18.221  }
  18.222  
  18.223  IA64FAULT vcpu_set_lrr0(VCPU *vcpu, UINT64 val)
  18.224  {
  18.225  	if (!(val & (1L << 16))) {
  18.226 -		printf("vcpu_set_lrr0: Unmasked interrupts unsupported\n");
  18.227 +		printk("vcpu_set_lrr0: Unmasked interrupts unsupported\n");
  18.228  		return (IA64_ILLOP_FAULT);
  18.229  	}
  18.230  	// no place to save this state but nothing to do anyway
  18.231 @@ -967,7 +967,7 @@ IA64FAULT vcpu_set_lrr0(VCPU *vcpu, UINT
  18.232  IA64FAULT vcpu_set_lrr1(VCPU *vcpu, UINT64 val)
  18.233  {
  18.234  	if (!(val & (1L << 16))) {
  18.235 -		printf("vcpu_set_lrr0: Unmasked interrupts unsupported\n");
  18.236 +		printk("vcpu_set_lrr0: Unmasked interrupts unsupported\n");
  18.237  		return (IA64_ILLOP_FAULT);
  18.238  	}
  18.239  	// no place to save this state but nothing to do anyway
  18.240 @@ -1051,7 +1051,7 @@ void vcpu_safe_set_itm(unsigned long val
  18.241  
  18.242  	local_irq_save(flags);
  18.243  	while (1) {
  18.244 -//printf("*** vcpu_safe_set_itm: Setting itm to %lx, itc=%lx\n",val,now);
  18.245 +//printk("*** vcpu_safe_set_itm: Setting itm to %lx, itc=%lx\n",val,now);
  18.246  		ia64_set_itm(val);
  18.247  		if (val > (now = ia64_get_itc())) break;
  18.248  		val = now + epsilon;
  18.249 @@ -1071,7 +1071,7 @@ void vcpu_set_next_timer(VCPU *vcpu)
  18.250  	 * but it doesn't matter right now */
  18.251  
  18.252  	if (is_idle_domain(vcpu->domain)) {
  18.253 -//		printf("****** vcpu_set_next_timer called during idle!!\n");
  18.254 +//		printk("****** vcpu_set_next_timer called during idle!!\n");
  18.255  		vcpu_safe_set_itm(s);
  18.256  		return;
  18.257  	}
  18.258 @@ -1091,7 +1091,7 @@ IA64FAULT vcpu_set_itm(VCPU *vcpu, UINT6
  18.259  	//UINT now = ia64_get_itc();
  18.260  
  18.261  	//if (val < now) val = now + 1000;
  18.262 -//printf("*** vcpu_set_itm: called with %lx\n",val);
  18.263 +//printk("*** vcpu_set_itm: called with %lx\n",val);
  18.264  	PSCBX(vcpu,domain_itm) = val;
  18.265  	vcpu_set_next_timer(vcpu);
  18.266  	return (IA64_NO_FAULT);
  18.267 @@ -1103,8 +1103,8 @@ IA64FAULT vcpu_set_itc(VCPU *vcpu, UINT6
  18.268  #ifdef DISALLOW_SETTING_ITC_FOR_NOW
  18.269  	static int did_print;
  18.270  	if (!did_print) {
  18.271 -		printf("vcpu_set_itc: Setting ar.itc is currently disabled\n");
  18.272 -		printf("(this message is only displayed one)\n");
  18.273 +		printk("vcpu_set_itc: Setting ar.itc is currently disabled\n");
  18.274 +		printk("(this message is only displayed one)\n");
  18.275  		did_print = 1;
  18.276  	}
  18.277  #else
  18.278 @@ -1117,7 +1117,7 @@ IA64FAULT vcpu_set_itc(VCPU *vcpu, UINT6
  18.279  
  18.280  	local_irq_disable();
  18.281  	if (olditm) {
  18.282 -printf("**** vcpu_set_itc(%lx): vitm changed to %lx\n",val,newnow+d);
  18.283 +printk("**** vcpu_set_itc(%lx): vitm changed to %lx\n",val,newnow+d);
  18.284  		PSCBX(vcpu,domain_itm) = newnow + d;
  18.285  	}
  18.286  	local_cpu_data->itm_next = newnow + x;
  18.287 @@ -1141,7 +1141,7 @@ printf("**** vcpu_set_itc(%lx): vitm cha
  18.288  IA64FAULT vcpu_get_itm(VCPU *vcpu, UINT64 *pval)
  18.289  {
  18.290  	//FIXME: Implement this
  18.291 -	printf("vcpu_get_itm: Getting cr.itm is unsupported... continuing\n");
  18.292 +	printk("vcpu_get_itm: Getting cr.itm is unsupported... continuing\n");
  18.293  	return (IA64_NO_FAULT);
  18.294  	//return (IA64_ILLOP_FAULT);
  18.295  }
  18.296 @@ -1149,7 +1149,7 @@ IA64FAULT vcpu_get_itm(VCPU *vcpu, UINT6
  18.297  IA64FAULT vcpu_get_itc(VCPU *vcpu, UINT64 *pval)
  18.298  {
  18.299  	//TODO: Implement this
  18.300 -	printf("vcpu_get_itc: Getting ar.itc is unsupported\n");
  18.301 +	printk("vcpu_get_itc: Getting ar.itc is unsupported\n");
  18.302  	return (IA64_ILLOP_FAULT);
  18.303  }
  18.304  
  18.305 @@ -1231,7 +1231,7 @@ IA64FAULT vcpu_rfi(VCPU *vcpu)
  18.306  	psr.ia64_psr.bn = 1;
  18.307  	//psr.pk = 1;  // checking pkeys shouldn't be a problem but seems broken
  18.308  	if (psr.ia64_psr.be) {
  18.309 -		printf("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
  18.310 +		printk("*** DOMAIN TRYING TO TURN ON BIG-ENDIAN!!!\n");
  18.311  		return (IA64_ILLOP_FAULT);
  18.312  	}
  18.313  	PSCB(vcpu,incomplete_regframe) = 0; // is this necessary?
  18.314 @@ -1297,7 +1297,7 @@ IA64FAULT vcpu_thash(VCPU *vcpu, UINT64 
  18.315  
  18.316  IA64FAULT vcpu_ttag(VCPU *vcpu, UINT64 vadr, UINT64 *padr)
  18.317  {
  18.318 -	printf("vcpu_ttag: ttag instruction unsupported\n");
  18.319 +	printk("vcpu_ttag: ttag instruction unsupported\n");
  18.320  	return (IA64_ILLOP_FAULT);
  18.321  }
  18.322  
  18.323 @@ -1601,7 +1601,7 @@ IA64FAULT vcpu_tpa(VCPU *vcpu, UINT64 va
  18.324  
  18.325  IA64FAULT vcpu_tak(VCPU *vcpu, UINT64 vadr, UINT64 *key)
  18.326  {
  18.327 -	printf("vcpu_tak: tak instruction unsupported\n");
  18.328 +	printk("vcpu_tak: tak instruction unsupported\n");
  18.329  	return (IA64_ILLOP_FAULT);
  18.330  	// HACK ALERT: tak does a thash for now
  18.331  	//return vcpu_thash(vcpu,vadr,key);
  18.332 @@ -1652,7 +1652,7 @@ IA64FAULT vcpu_set_pmc(VCPU *vcpu, UINT6
  18.333  	// TODO: Should set Logical CPU state, not just physical
  18.334  	// NOTE: Writes to unimplemented PMC registers are discarded
  18.335  #ifdef DEBUG_PFMON
  18.336 -printf("vcpu_set_pmc(%x,%lx)\n",reg,val);
  18.337 +printk("vcpu_set_pmc(%x,%lx)\n",reg,val);
  18.338  #endif
  18.339  	ia64_set_pmc(reg,val);
  18.340  	return (IA64_NO_FAULT);
  18.341 @@ -1663,7 +1663,7 @@ IA64FAULT vcpu_set_pmd(VCPU *vcpu, UINT6
  18.342  	// TODO: Should set Logical CPU state, not just physical
  18.343  	// NOTE: Writes to unimplemented PMD registers are discarded
  18.344  #ifdef DEBUG_PFMON
  18.345 -printf("vcpu_set_pmd(%x,%lx)\n",reg,val);
  18.346 +printk("vcpu_set_pmd(%x,%lx)\n",reg,val);
  18.347  #endif
  18.348  	ia64_set_pmd(reg,val);
  18.349  	return (IA64_NO_FAULT);
  18.350 @@ -1674,7 +1674,7 @@ IA64FAULT vcpu_get_pmc(VCPU *vcpu, UINT6
  18.351  	// NOTE: Reads from unimplemented PMC registers return zero
  18.352  	UINT64 val = (UINT64)ia64_get_pmc(reg);
  18.353  #ifdef DEBUG_PFMON
  18.354 -printf("%lx=vcpu_get_pmc(%x)\n",val,reg);
  18.355 +printk("%lx=vcpu_get_pmc(%x)\n",val,reg);
  18.356  #endif
  18.357  	*pval = val;
  18.358  	return (IA64_NO_FAULT);
  18.359 @@ -1685,7 +1685,7 @@ IA64FAULT vcpu_get_pmd(VCPU *vcpu, UINT6
  18.360  	// NOTE: Reads from unimplemented PMD registers return zero
  18.361  	UINT64 val = (UINT64)ia64_get_pmd(reg);
  18.362  #ifdef DEBUG_PFMON
  18.363 -printf("%lx=vcpu_get_pmd(%x)\n",val,reg);
  18.364 +printk("%lx=vcpu_get_pmd(%x)\n",val,reg);
  18.365  #endif
  18.366  	*pval = val;
  18.367  	return (IA64_NO_FAULT);
  18.368 @@ -1914,7 +1914,7 @@ IA64FAULT vcpu_itr_d(VCPU *vcpu, UINT64 
  18.369  	vcpu_purge_tr_entry(&PSCBX(vcpu, dtlb));
  18.370  
  18.371  	trp = &PSCBX(vcpu,dtrs[slot]);
  18.372 -//printf("***** itr.d: setting slot %d: ifa=%p\n",slot,ifa);
  18.373 +//printk("***** itr.d: setting slot %d: ifa=%p\n",slot,ifa);
  18.374  	vcpu_set_tr_entry(trp,pte,itir,ifa);
  18.375  	vcpu_quick_region_set(PSCBX(vcpu,dtr_regions),ifa);
  18.376  
  18.377 @@ -1940,7 +1940,7 @@ IA64FAULT vcpu_itr_i(VCPU *vcpu, UINT64 
  18.378  	vcpu_purge_tr_entry(&PSCBX(vcpu, itlb));
  18.379  
  18.380  	trp = &PSCBX(vcpu,itrs[slot]);
  18.381 -//printf("***** itr.i: setting slot %d: ifa=%p\n",slot,ifa);
  18.382 +//printk("***** itr.i: setting slot %d: ifa=%p\n",slot,ifa);
  18.383  	vcpu_set_tr_entry(trp,pte,itir,ifa);
  18.384  	vcpu_quick_region_set(PSCBX(vcpu,itr_regions),ifa);
  18.385  
  18.386 @@ -2020,7 +2020,7 @@ void vcpu_itc_no_srlz(VCPU *vcpu, UINT64
  18.387  		// FIXME: this is dangerous... vhpt_flush_address ensures these
  18.388  		// addresses never get flushed.  More work needed if this
  18.389  		// ever happens.
  18.390 -//printf("vhpt_insert(%p,%p,%p)\n",vaddr,pte,1L<<logps);
  18.391 +//printk("vhpt_insert(%p,%p,%p)\n",vaddr,pte,1L<<logps);
  18.392  		if (logps > PAGE_SHIFT) vhpt_multiple_insert(vaddr,pte,logps);
  18.393  		else vhpt_insert(vaddr,pte,logps<<2);
  18.394  	}
  18.395 @@ -2147,7 +2147,7 @@ IA64FAULT vcpu_ptc_ga(VCPU *vcpu,UINT64 
  18.396  	// FIXME: validate not flushing Xen addresses
  18.397  	// if (Xen address) return(IA64_ILLOP_FAULT);
  18.398  	// FIXME: ??breaks if domain PAGE_SIZE < Xen PAGE_SIZE
  18.399 -//printf("######## vcpu_ptc_ga(%p,%p) ##############\n",vadr,addr_range);
  18.400 +//printk("######## vcpu_ptc_ga(%p,%p) ##############\n",vadr,addr_range);
  18.401  
  18.402  	check_xen_space_overlap ("ptc_ga", vadr, addr_range);
  18.403  
    19.1 --- a/xen/arch/ia64/xen/vhpt.c	Mon Oct 23 14:19:14 2006 +0100
    19.2 +++ b/xen/arch/ia64/xen/vhpt.c	Mon Oct 23 14:42:52 2006 +0100
    19.3 @@ -87,7 +87,7 @@ void vhpt_multiple_insert(unsigned long 
    19.4  		//  only a few times/second, so OK for now.
    19.5  		//  An alternate solution would be to just insert the one
    19.6  		//  16KB in the vhpt (but with the full mapping)?
    19.7 -		//printf("vhpt_multiple_insert: logps-PAGE_SHIFT==%d,"
    19.8 +		//printk("vhpt_multiple_insert: logps-PAGE_SHIFT==%d,"
    19.9  			//"va=%p, pa=%p, pa-masked=%p\n",
   19.10  			//logps-PAGE_SHIFT,vaddr,pte&_PFN_MASK,
   19.11  			//(pte&_PFN_MASK)&~mask);
   19.12 @@ -120,7 +120,7 @@ void vhpt_init(void)
   19.13  		panic("vhpt_init: bad VHPT alignment!\n");
   19.14  	__get_cpu_var(vhpt_paddr) = paddr;
   19.15  	__get_cpu_var(vhpt_pend) = paddr + (1 << VHPT_SIZE_LOG2) - 1;
   19.16 -	printf("vhpt_init: vhpt paddr=0x%lx, end=0x%lx\n",
   19.17 +	printk("vhpt_init: vhpt paddr=0x%lx, end=0x%lx\n",
   19.18  		paddr, __get_cpu_var(vhpt_pend));
   19.19  	pte = pte_val(pfn_pte(paddr >> PAGE_SHIFT, PAGE_KERNEL));
   19.20  	vhpt_map(pte);
   19.21 @@ -209,7 +209,7 @@ void domain_flush_vtlb_range (struct dom
   19.22  #if 0
   19.23  	// this only seems to occur at shutdown, but it does occur
   19.24  	if ((!addr_range) || addr_range & (addr_range - 1)) {
   19.25 -		printf("vhpt_flush_address: weird range, spinning...\n");
   19.26 +		printk("vhpt_flush_address: weird range, spinning...\n");
   19.27  		while(1);
   19.28  	}
   19.29  #endif
    20.1 --- a/xen/arch/ia64/xen/xenmisc.c	Mon Oct 23 14:19:14 2006 +0100
    20.2 +++ b/xen/arch/ia64/xen/xenmisc.c	Mon Oct 23 14:42:52 2006 +0100
    20.3 @@ -179,13 +179,13 @@ void panic_domain(struct pt_regs *regs, 
    20.4  	char buf[256];
    20.5  	struct vcpu *v = current;
    20.6  
    20.7 -	printf("$$$$$ PANIC in domain %d (k6=0x%lx): ",
    20.8 +	printk("$$$$$ PANIC in domain %d (k6=0x%lx): ",
    20.9  		v->domain->domain_id,
   20.10  		__get_cpu_var(cpu_kr)._kr[IA64_KR_CURRENT]);
   20.11  	va_start(args, fmt);
   20.12  	(void)vsnprintf(buf, sizeof(buf), fmt, args);
   20.13  	va_end(args);
   20.14 -	printf(buf);
   20.15 +	printk(buf);
   20.16  	if (regs) show_registers(regs);
   20.17  	if (regs) {
   20.18  		debugger_trap_fatal(0 /* don't care */, regs);
    21.1 --- a/xen/arch/ia64/xen/xensetup.c	Mon Oct 23 14:19:14 2006 +0100
    21.2 +++ b/xen/arch/ia64/xen/xensetup.c	Mon Oct 23 14:42:52 2006 +0100
    21.3 @@ -386,13 +386,13 @@ void start_kernel(void)
    21.4      /* first find highest page frame number */
    21.5      max_page = 0;
    21.6      efi_memmap_walk(find_max_pfn, &max_page);
    21.7 -    printf("find_memory: efi_memmap_walk returns max_page=%lx\n",max_page);
    21.8 +    printk("find_memory: efi_memmap_walk returns max_page=%lx\n",max_page);
    21.9      efi_print();
   21.10  
   21.11      heap_start = memguard_init(ia64_imva(&_end));
   21.12 -    printf("Before heap_start: %p\n", heap_start);
   21.13 +    printk("Before heap_start: %p\n", heap_start);
   21.14      heap_start = __va(init_boot_allocator(__pa(heap_start)));
   21.15 -    printf("After heap_start: %p\n", heap_start);
   21.16 +    printk("After heap_start: %p\n", heap_start);
   21.17  
   21.18      efi_memmap_walk(filter_rsvd_memory, init_boot_pages);
   21.19      efi_memmap_walk(xen_count_pages, &nr_pages);
    22.1 --- a/xen/arch/ia64/xen/xentime.c	Mon Oct 23 14:19:14 2006 +0100
    22.2 +++ b/xen/arch/ia64/xen/xentime.c	Mon Oct 23 14:42:52 2006 +0100
    22.3 @@ -116,7 +116,7 @@ xen_timer_interrupt (int irq, void *dev_
    22.4  #ifdef HEARTBEAT_FREQ
    22.5  	static long count = 0;
    22.6  	if (!(++count & ((HEARTBEAT_FREQ*1024)-1))) {
    22.7 -		printf("Heartbeat... iip=%p\n", /*",psr.i=%d,pend=%d\n", */
    22.8 +		printk("Heartbeat... iip=%p\n", /*",psr.i=%d,pend=%d\n", */
    22.9  			regs->cr_iip /*,
   22.10  			!current->vcpu_info->evtchn_upcall_mask,
   22.11  			VCPU(current,pending_interruption) */);
    23.1 --- a/xen/arch/powerpc/backtrace.c	Mon Oct 23 14:19:14 2006 +0100
    23.2 +++ b/xen/arch/powerpc/backtrace.c	Mon Oct 23 14:42:52 2006 +0100
    23.3 @@ -93,13 +93,13 @@ static void xmon_print_symbol(unsigned l
    23.4  	const char *name = NULL;
    23.5  	unsigned long offset, size;
    23.6  
    23.7 -	printf(REG, address);
    23.8 +	printk(REG, address);
    23.9  
   23.10      name = symbols_lookup(address, &size, &offset, namebuf);
   23.11  	if (name) {
   23.12 -		printf("%s%s+%#lx/%#lx", mid, name, offset, size);
   23.13 +		printk("%s%s+%#lx/%#lx", mid, name, offset, size);
   23.14  	}
   23.15 -	printf("%s", after);
   23.16 +	printk("%s", after);
   23.17  }
   23.18  
   23.19  static void backtrace(
   23.20 @@ -114,13 +114,13 @@ static void backtrace(
   23.21  	do {
   23.22  		if (sp > xenheap_phys_end) {
   23.23  			if (sp != 0)
   23.24 -				printf("SP (%lx) is not in xen space\n", sp);
   23.25 +				printk("SP (%lx) is not in xen space\n", sp);
   23.26  			break;
   23.27  		}
   23.28  
   23.29  		if (!mread(sp + LRSAVE_OFFSET, &ip, sizeof(unsigned long))
   23.30  		    || !mread(sp, &newsp, sizeof(unsigned long))) {
   23.31 -			printf("Couldn't read stack frame at %lx\n", sp);
   23.32 +			printk("Couldn't read stack frame at %lx\n", sp);
   23.33  			break;
   23.34  		}
   23.35  
   23.36 @@ -147,17 +147,17 @@ static void backtrace(
   23.37  				printip = 0;
   23.38  			} else if (lr < xenheap_phys_end
   23.39                         && !(fnstart <= lr && lr < fnend)) {
   23.40 -				printf("[link register   ] ");
   23.41 +				printk("[link register   ] ");
   23.42  				xmon_print_symbol(lr, " ", "\n");
   23.43  			}
   23.44  			if (printip) {
   23.45 -				printf("["REG"] ", sp);
   23.46 +				printk("["REG"] ", sp);
   23.47  				xmon_print_symbol(ip, " ", " (unreliable)\n");
   23.48  			}
   23.49  			pc = lr = 0;
   23.50  
   23.51  		} else {
   23.52 -			printf("["REG"] ", sp);
   23.53 +			printk("["REG"] ", sp);
   23.54  			xmon_print_symbol(ip, " ", "\n");
   23.55  		}
   23.56  
   23.57 @@ -167,11 +167,11 @@ static void backtrace(
   23.58  		    && marker == REG_FRAME_MARKER) {
   23.59  			if (mread(sp + REGS_OFFSET, &regs, sizeof(regs))
   23.60  			    != sizeof(regs)) {
   23.61 -				printf("Couldn't read registers at %lx\n",
   23.62 +				printk("Couldn't read registers at %lx\n",
   23.63  				       sp + REGS_OFFSET);
   23.64  				break;
   23.65  			}
   23.66 -            printf("--- Exception: %x %s at ", regs.entry_vector,
   23.67 +            printk("--- Exception: %x %s at ", regs.entry_vector,
   23.68  			       getvecname(TRAP(&regs)));
   23.69  			pc = regs.pc;
   23.70  			lr = regs.lr;
    24.1 --- a/xen/arch/powerpc/domain.c	Mon Oct 23 14:19:14 2006 +0100
    24.2 +++ b/xen/arch/powerpc/domain.c	Mon Oct 23 14:42:52 2006 +0100
    24.3 @@ -97,14 +97,14 @@ void arch_domain_destroy(struct domain *
    24.4  
    24.5  void machine_halt(void)
    24.6  {
    24.7 -    printf("machine_halt called: spinning....\n");
    24.8 +    printk("machine_halt called: spinning....\n");
    24.9      console_start_sync();
   24.10      while(1);
   24.11  }
   24.12  
   24.13  void machine_restart(char * __unused)
   24.14  {
   24.15 -    printf("machine_restart called: spinning....\n");
   24.16 +    printk("machine_restart called: spinning....\n");
   24.17      console_start_sync();
   24.18      while(1);
   24.19  }
   24.20 @@ -134,7 +134,7 @@ int arch_set_info_guest(struct vcpu *v, 
   24.21  { 
   24.22      memcpy(&v->arch.ctxt, &c->user_regs, sizeof(c->user_regs));
   24.23  
   24.24 -    printf("Domain[%d].%d: initializing\n",
   24.25 +    printk("Domain[%d].%d: initializing\n",
   24.26             v->domain->domain_id, v->vcpu_id);
   24.27  
   24.28      if (v->domain->arch.htab.order == 0)
   24.29 @@ -186,7 +186,7 @@ void context_switch(struct vcpu *prev, s
   24.30      unsigned int cpu = smp_processor_id();
   24.31  
   24.32  #if 0
   24.33 -    printf("%s: dom %x to dom %x\n", __func__, prev->domain->domain_id,
   24.34 +    printk("%s: dom %x to dom %x\n", __func__, prev->domain->domain_id,
   24.35              next->domain->domain_id);
   24.36  #endif
   24.37  
    25.1 --- a/xen/arch/powerpc/of-devwalk.c	Mon Oct 23 14:19:14 2006 +0100
    25.2 +++ b/xen/arch/powerpc/of-devwalk.c	Mon Oct 23 14:42:52 2006 +0100
    25.3 @@ -35,7 +35,7 @@ void ofd_prop_print(
    25.4      if ( path[0] == '/' && path[1] == '\0' ) {
    25.5          path = "";
    25.6      }
    25.7 -    printf("%s: %s/%s: 0x%lx\n", head, path,  name, sz);
    25.8 +    printk("%s: %s/%s: 0x%lx\n", head, path,  name, sz);
    25.9  
   25.10  #define DEBUG_PROP
   25.11  #ifdef DEBUG_PROP
   25.12 @@ -56,24 +56,24 @@ void ofd_prop_print(
   25.13      }
   25.14  
   25.15      if ( isstr > 0 ) {
   25.16 -        printf("%s: \t%s\n", head, b);
   25.17 +        printk("%s: \t%s\n", head, b);
   25.18      } else if ( sz != 0 ) {
   25.19 -        printf("%s: \t0x", head);
   25.20 +        printk("%s: \t0x", head);
   25.21  
   25.22          for ( i = 0; i < sz; i++ ) {
   25.23              if ( (i % 4) == 0 && i != 0 ) {
   25.24                  if ( (i % 16) == 0 && i != 0 ) {
   25.25 -                    printf("\n%s: \t0x", head);
   25.26 +                    printk("\n%s: \t0x", head);
   25.27                  } else {
   25.28 -                    printf(" 0x");
   25.29 +                    printk(" 0x");
   25.30                  }
   25.31              }
   25.32              if (b[i] < 0x10) {
   25.33 -                printf("0");
   25.34 +                printk("0");
   25.35              }
   25.36 -            printf("%x", b[i]);
   25.37 +            printk("%x", b[i]);
   25.38          }
   25.39 -        printf("\n");
   25.40 +        printk("\n");
   25.41      }
   25.42  #else
   25.43      (void)prop;
   25.44 @@ -95,7 +95,7 @@ void ofd_dump_props(void *mem, ofdn_t n,
   25.45      }
   25.46  
   25.47      if (dump & OFD_DUMP_NAMES) {
   25.48 -        printf("of_walk: %s: phandle 0x%x\n", path, n);
   25.49 +        printk("of_walk: %s: phandle 0x%x\n", path, n);
   25.50      }
   25.51  
   25.52      p = ofd_nextprop(mem, n, NULL, name);
    26.1 --- a/xen/arch/powerpc/powerpc64/domain.c	Mon Oct 23 14:19:14 2006 +0100
    26.2 +++ b/xen/arch/powerpc/powerpc64/domain.c	Mon Oct 23 14:42:52 2006 +0100
    26.3 @@ -112,7 +112,7 @@ void save_segments(struct vcpu *v)
    26.4          slb_entry[i].slb_esid = esid;
    26.5  #ifdef SLB_DEBUG
    26.6          if (vsid != 0) {
    26.7 -            printf("%s: DOM[0x%x]: S%02d: 0x%016lx 0x%016lx\n",
    26.8 +            printk("%s: DOM[0x%x]: S%02d: 0x%016lx 0x%016lx\n",
    26.9                      __func__, v->domain->domain_id, i, vsid, esid);
   26.10          }
   26.11  #endif
   26.12 @@ -146,7 +146,7 @@ void load_segments(struct vcpu *v)
   26.13  
   26.14  #ifdef SLB_DEBUG
   26.15          if (vsid != 0) {
   26.16 -            printf("%s: DOM[0x%x]: R%02d: 0x%016lx 0x%016lx\n",
   26.17 +            printk("%s: DOM[0x%x]: R%02d: 0x%016lx 0x%016lx\n",
   26.18                      __func__, v->domain->domain_id, i, vsid, esid);
   26.19          }
   26.20  #endif
   26.21 @@ -173,6 +173,6 @@ void dump_segments(int valid)
   26.22  
   26.23          if (valid && !(esid & SLB_ESID_VALID))
   26.24              continue;
   26.25 -        printf("S%02d: 0x%016lx 0x%016lx\n", i, vsid, esid);
   26.26 +        printk("S%02d: 0x%016lx 0x%016lx\n", i, vsid, esid);
   26.27      }
   26.28  }
    27.1 --- a/xen/arch/x86/boot/x86_32.S	Mon Oct 23 14:19:14 2006 +0100
    27.2 +++ b/xen/arch/x86/boot/x86_32.S	Mon Oct 23 14:42:52 2006 +0100
    27.3 @@ -185,7 +185,7 @@ ignore_int:
    27.4          mov     %eax,%ds
    27.5          mov     %eax,%es
    27.6          pushl   $int_msg
    27.7 -        call    printf
    27.8 +        call    printk
    27.9  1:      jmp     1b
   27.10  
   27.11  /*** STACK LOCATION ***/
    28.1 --- a/xen/arch/x86/boot/x86_64.S	Mon Oct 23 14:19:14 2006 +0100
    28.2 +++ b/xen/arch/x86/boot/x86_64.S	Mon Oct 23 14:42:52 2006 +0100
    28.3 @@ -186,7 +186,7 @@ ignore_int:
    28.4          cld
    28.5          leaq    int_msg(%rip),%rdi
    28.6          xorl    %eax,%eax
    28.7 -        call    printf
    28.8 +        call    printk
    28.9  1:      jmp     1b
   28.10  
   28.11  
    29.1 --- a/xen/arch/x86/hvm/hvm.c	Mon Oct 23 14:19:14 2006 +0100
    29.2 +++ b/xen/arch/x86/hvm/hvm.c	Mon Oct 23 14:42:52 2006 +0100
    29.3 @@ -248,7 +248,7 @@ void hvm_do_resume(struct vcpu *v)
    29.4      case STATE_INVALID:
    29.5          break;
    29.6      default:
    29.7 -        printf("Weird HVM iorequest state %d.\n", p->state);
    29.8 +        printk("Weird HVM iorequest state %d.\n", p->state);
    29.9          domain_crash(v->domain);
   29.10      }
   29.11  }
    30.1 --- a/xen/arch/x86/hvm/io.c	Mon Oct 23 14:19:14 2006 +0100
    30.2 +++ b/xen/arch/x86/hvm/io.c	Mon Oct 23 14:42:52 2006 +0100
    30.3 @@ -723,7 +723,7 @@ void hvm_io_assist(struct vcpu *v)
    30.4      vio = get_vio(v->domain, v->vcpu_id);
    30.5  
    30.6      if ( vio == 0 ) {
    30.7 -        printf("bad shared page: %lx\n", (unsigned long)vio);
    30.8 +        printk("bad shared page: %lx\n", (unsigned long)vio);
    30.9          domain_crash_synchronous();
   30.10      }
   30.11  
    31.1 --- a/xen/arch/x86/hvm/platform.c	Mon Oct 23 14:19:14 2006 +0100
    31.2 +++ b/xen/arch/x86/hvm/platform.c	Mon Oct 23 14:42:52 2006 +0100
    31.3 @@ -741,7 +741,8 @@ void send_pio_req(unsigned long port, un
    31.4      ioreq_t *p;
    31.5  
    31.6      if ( size == 0 || count == 0 ) {
    31.7 -        printf("null pio request? port %lx, count %lx, size %d, value %lx, dir %d, pvalid %d.\n",
    31.8 +        printk("null pio request? port %lx, count %lx, "
    31.9 +               "size %d, value %lx, dir %d, pvalid %d.\n",
   31.10                 port, count, size, value, dir, pvalid);
   31.11      }
   31.12  
   31.13 @@ -794,7 +795,8 @@ static void send_mmio_req(unsigned char 
   31.14      ioreq_t *p;
   31.15  
   31.16      if ( size == 0 || count == 0 ) {
   31.17 -        printf("null mmio request? type %d, gpa %lx, count %lx, size %d, value %lx, dir %d, pvalid %d.\n",
   31.18 +        printk("null mmio request? type %d, gpa %lx, "
   31.19 +               "count %lx, size %d, value %lx, dir %d, pvalid %d.\n",
   31.20                 type, gpa, count, size, value, dir, pvalid);
   31.21      }
   31.22  
    32.1 --- a/xen/arch/x86/hvm/svm/intr.c	Mon Oct 23 14:19:14 2006 +0100
    32.2 +++ b/xen/arch/x86/hvm/svm/intr.c	Mon Oct 23 14:42:52 2006 +0100
    32.3 @@ -59,7 +59,7 @@ static inline int svm_inject_extint(stru
    32.4      intr.fields.prio = 0xF;
    32.5      intr.fields.ign_tpr = 1;
    32.6      vmcb->vintr = intr;
    32.7 -//  printf( "IRQ = %d\n", trap );
    32.8 +
    32.9      return 0;
   32.10  }
   32.11      
    33.1 --- a/xen/arch/x86/hvm/svm/svm.c	Mon Oct 23 14:19:14 2006 +0100
    33.2 +++ b/xen/arch/x86/hvm/svm/svm.c	Mon Oct 23 14:42:52 2006 +0100
    33.3 @@ -1021,7 +1021,7 @@ static void svm_do_general_protection_fa
    33.4      error_code = vmcb->exitinfo1;
    33.5  
    33.6      if (vmcb->idtr.limit == 0) {
    33.7 -        printf("Huh? We got a GP Fault with an invalid IDTR!\n");
    33.8 +        printk("Huh? We got a GP Fault with an invalid IDTR!\n");
    33.9          svm_dump_vmcb(__func__, vmcb);
   33.10          svm_dump_regs(__func__, regs);
   33.11          svm_dump_inst(vmcb->rip);
   33.12 @@ -2295,7 +2295,7 @@ static int svm_do_vmmcall(struct vcpu *v
   33.13          /* VMMCALL sanity check */
   33.14          if ( vmcb->cpl > get_vmmcall_cpl(regs->edi) )
   33.15          {
   33.16 -            printf("VMMCALL CPL check failed\n");
   33.17 +            printk("VMMCALL CPL check failed\n");
   33.18              return -1;
   33.19          }
   33.20  
   33.21 @@ -2305,7 +2305,7 @@ static int svm_do_vmmcall(struct vcpu *v
   33.22          case VMMCALL_RESET_TO_REALMODE:
   33.23              if ( svm_do_vmmcall_reset_to_realmode(v, regs) )
   33.24              {
   33.25 -                printf("svm_do_vmmcall_reset_to_realmode() failed\n");
   33.26 +                printk("svm_do_vmmcall_reset_to_realmode() failed\n");
   33.27                  return -1;
   33.28              }
   33.29              /* since we just reset the VMCB, return without adjusting
   33.30 @@ -2313,7 +2313,7 @@ static int svm_do_vmmcall(struct vcpu *v
   33.31              return 0;
   33.32  
   33.33          case VMMCALL_DEBUG:
   33.34 -            printf("DEBUG features not implemented yet\n");
   33.35 +            printk("DEBUG features not implemented yet\n");
   33.36              break;
   33.37          default:
   33.38              break;
   33.39 @@ -2344,16 +2344,16 @@ void svm_dump_inst(unsigned long eip)
   33.40      if (hvm_copy_from_guest_virt(opcode, ptr, sizeof(opcode)) == 0)
   33.41          len = sizeof(opcode);
   33.42  
   33.43 -    printf("Code bytes around(len=%d) %lx:", len, eip);
   33.44 +    printk("Code bytes around(len=%d) %lx:", len, eip);
   33.45      for (i = 0; i < len; i++)
   33.46      {
   33.47          if ((i & 0x0f) == 0)
   33.48 -            printf("\n%08lx:", ptr+i);
   33.49 -
   33.50 -        printf("%02x ", opcode[i]);
   33.51 +            printk("\n%08lx:", ptr+i);
   33.52 +
   33.53 +        printk("%02x ", opcode[i]);
   33.54      }
   33.55  
   33.56 -    printf("\n");
   33.57 +    printk("\n");
   33.58  }
   33.59  
   33.60  
   33.61 @@ -2363,7 +2363,7 @@ void svm_dump_regs(const char *from, str
   33.62      struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb;
   33.63      unsigned long pt = v->arch.hvm_vcpu.hw_cr3;
   33.64  
   33.65 -    printf("%s: guest registers from %s:\n", __func__, from);
   33.66 +    printk("%s: guest registers from %s:\n", __func__, from);
   33.67  #if defined (__x86_64__)
   33.68      printk("rax: %016lx   rbx: %016lx   rcx: %016lx\n",
   33.69             regs->rax, regs->rbx, regs->rcx);
   33.70 @@ -2378,15 +2378,15 @@ void svm_dump_regs(const char *from, str
   33.71      printk("r15: %016lx   cr0: %016lx   cr3: %016lx\n",
   33.72             regs->r15, v->arch.hvm_svm.cpu_shadow_cr0, vmcb->cr3);
   33.73  #else
   33.74 -    printf("eax: %08x, ebx: %08x, ecx: %08x, edx: %08x\n", 
   33.75 +    printk("eax: %08x, ebx: %08x, ecx: %08x, edx: %08x\n", 
   33.76             regs->eax, regs->ebx, regs->ecx, regs->edx);
   33.77 -    printf("edi: %08x, esi: %08x, ebp: %08x, esp: %08x\n", 
   33.78 +    printk("edi: %08x, esi: %08x, ebp: %08x, esp: %08x\n", 
   33.79             regs->edi, regs->esi, regs->ebp, regs->esp);
   33.80 -    printf("%s: guest cr0: %lx\n", __func__, 
   33.81 +    printk("%s: guest cr0: %lx\n", __func__, 
   33.82             v->arch.hvm_svm.cpu_shadow_cr0);
   33.83 -    printf("guest CR3 = %llx\n", vmcb->cr3);
   33.84 +    printk("guest CR3 = %llx\n", vmcb->cr3);
   33.85  #endif
   33.86 -    printf("%s: pt = %lx\n", __func__, pt);
   33.87 +    printk("%s: pt = %lx\n", __func__, pt);
   33.88  }
   33.89  
   33.90  
   33.91 @@ -2395,12 +2395,12 @@ void svm_dump_host_regs(const char *from
   33.92      struct vcpu *v = current;
   33.93      unsigned long pt = pt = pagetable_get_paddr(v->arch.monitor_table);
   33.94      unsigned long cr3, cr0;
   33.95 -    printf("Host registers at %s\n", from);
   33.96 +    printk("Host registers at %s\n", from);
   33.97  
   33.98      __asm__ __volatile__ ("\tmov %%cr0,%0\n"
   33.99                            "\tmov %%cr3,%1\n"
  33.100                            : "=r" (cr0), "=r"(cr3));
  33.101 -    printf("%s: pt = %lx, cr3 = %lx, cr0 = %lx\n", __func__, pt, cr3, cr0);
  33.102 +    printk("%s: pt = %lx, cr3 = %lx, cr0 = %lx\n", __func__, pt, cr3, cr0);
  33.103  }
  33.104  
  33.105  #ifdef SVM_EXTRA_DEBUG
    34.1 --- a/xen/arch/x86/hvm/svm/vmcb.c	Mon Oct 23 14:19:14 2006 +0100
    34.2 +++ b/xen/arch/x86/hvm/svm/vmcb.c	Mon Oct 23 14:42:52 2006 +0100
    34.3 @@ -408,7 +408,7 @@ void svm_do_launch(struct vcpu *v)
    34.4  
    34.5  static void svm_dump_sel(char *name, segment_selector_t *s)
    34.6  {
    34.7 -    printf("%s: sel=0x%04x, attr=0x%04x, limit=0x%08x, base=0x%016llx\n", 
    34.8 +    printk("%s: sel=0x%04x, attr=0x%04x, limit=0x%08x, base=0x%016llx\n", 
    34.9             name, s->sel, s->attributes.bytes, s->limit,
   34.10             (unsigned long long)s->base);
   34.11  }
   34.12 @@ -416,50 +416,50 @@ static void svm_dump_sel(char *name, seg
   34.13  
   34.14  void svm_dump_vmcb(const char *from, struct vmcb_struct *vmcb)
   34.15  {
   34.16 -    printf("Dumping guest's current state at %s...\n", from);
   34.17 -    printf("Size of VMCB = %d, address = %p\n", 
   34.18 +    printk("Dumping guest's current state at %s...\n", from);
   34.19 +    printk("Size of VMCB = %d, address = %p\n", 
   34.20              (int) sizeof(struct vmcb_struct), vmcb);
   34.21  
   34.22 -    printf("cr_intercepts = 0x%08x dr_intercepts = 0x%08x "
   34.23 +    printk("cr_intercepts = 0x%08x dr_intercepts = 0x%08x "
   34.24             "exception_intercepts = 0x%08x\n", 
   34.25             vmcb->cr_intercepts, vmcb->dr_intercepts, 
   34.26             vmcb->exception_intercepts);
   34.27 -    printf("general1_intercepts = 0x%08x general2_intercepts = 0x%08x\n", 
   34.28 +    printk("general1_intercepts = 0x%08x general2_intercepts = 0x%08x\n", 
   34.29             vmcb->general1_intercepts, vmcb->general2_intercepts);
   34.30 -    printf("iopm_base_pa = %016llx msrpm_base_pa = 0x%016llx tsc_offset = "
   34.31 +    printk("iopm_base_pa = %016llx msrpm_base_pa = 0x%016llx tsc_offset = "
   34.32              "0x%016llx\n", 
   34.33             (unsigned long long) vmcb->iopm_base_pa,
   34.34             (unsigned long long) vmcb->msrpm_base_pa,
   34.35             (unsigned long long) vmcb->tsc_offset);
   34.36 -    printf("tlb_control = 0x%08x vintr = 0x%016llx interrupt_shadow = "
   34.37 +    printk("tlb_control = 0x%08x vintr = 0x%016llx interrupt_shadow = "
   34.38              "0x%016llx\n", vmcb->tlb_control,
   34.39             (unsigned long long) vmcb->vintr.bytes,
   34.40             (unsigned long long) vmcb->interrupt_shadow);
   34.41 -    printf("exitcode = 0x%016llx exitintinfo = 0x%016llx\n", 
   34.42 +    printk("exitcode = 0x%016llx exitintinfo = 0x%016llx\n", 
   34.43             (unsigned long long) vmcb->exitcode,
   34.44             (unsigned long long) vmcb->exitintinfo.bytes);
   34.45 -    printf("exitinfo1 = 0x%016llx exitinfo2 = 0x%016llx \n",
   34.46 +    printk("exitinfo1 = 0x%016llx exitinfo2 = 0x%016llx \n",
   34.47             (unsigned long long) vmcb->exitinfo1,
   34.48             (unsigned long long) vmcb->exitinfo2);
   34.49 -    printf("np_enable = 0x%016llx guest_asid = 0x%03x\n", 
   34.50 +    printk("np_enable = 0x%016llx guest_asid = 0x%03x\n", 
   34.51             (unsigned long long) vmcb->np_enable, vmcb->guest_asid);
   34.52 -    printf("cpl = %d efer = 0x%016llx star = 0x%016llx lstar = 0x%016llx\n", 
   34.53 +    printk("cpl = %d efer = 0x%016llx star = 0x%016llx lstar = 0x%016llx\n", 
   34.54             vmcb->cpl, (unsigned long long) vmcb->efer,
   34.55             (unsigned long long) vmcb->star, (unsigned long long) vmcb->lstar);
   34.56 -    printf("CR0 = 0x%016llx CR2 = 0x%016llx\n",
   34.57 +    printk("CR0 = 0x%016llx CR2 = 0x%016llx\n",
   34.58             (unsigned long long) vmcb->cr0, (unsigned long long) vmcb->cr2);
   34.59 -    printf("CR3 = 0x%016llx CR4 = 0x%016llx\n", 
   34.60 +    printk("CR3 = 0x%016llx CR4 = 0x%016llx\n", 
   34.61             (unsigned long long) vmcb->cr3, (unsigned long long) vmcb->cr4);
   34.62 -    printf("RSP = 0x%016llx  RIP = 0x%016llx\n", 
   34.63 +    printk("RSP = 0x%016llx  RIP = 0x%016llx\n", 
   34.64             (unsigned long long) vmcb->rsp, (unsigned long long) vmcb->rip);
   34.65 -    printf("RAX = 0x%016llx  RFLAGS=0x%016llx\n",
   34.66 +    printk("RAX = 0x%016llx  RFLAGS=0x%016llx\n",
   34.67             (unsigned long long) vmcb->rax, (unsigned long long) vmcb->rflags);
   34.68 -    printf("DR6 = 0x%016llx, DR7 = 0x%016llx\n", 
   34.69 +    printk("DR6 = 0x%016llx, DR7 = 0x%016llx\n", 
   34.70             (unsigned long long) vmcb->dr6, (unsigned long long) vmcb->dr7);
   34.71 -    printf("CSTAR = 0x%016llx SFMask = 0x%016llx\n",
   34.72 +    printk("CSTAR = 0x%016llx SFMask = 0x%016llx\n",
   34.73             (unsigned long long) vmcb->cstar, 
   34.74             (unsigned long long) vmcb->sfmask);
   34.75 -    printf("KernGSBase = 0x%016llx PAT = 0x%016llx \n", 
   34.76 +    printk("KernGSBase = 0x%016llx PAT = 0x%016llx \n", 
   34.77             (unsigned long long) vmcb->kerngsbase,
   34.78             (unsigned long long) vmcb->g_pat);
   34.79      
    35.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Mon Oct 23 14:19:14 2006 +0100
    35.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Mon Oct 23 14:42:52 2006 +0100
    35.3 @@ -1087,7 +1087,7 @@ static int check_for_null_selector(unsig
    35.4      memset(inst, 0, MAX_INST_LEN);
    35.5      if ( inst_copy_from_guest(inst, eip, inst_len) != inst_len )
    35.6      {
    35.7 -        printf("check_for_null_selector: get guest instruction failed\n");
    35.8 +        printk("check_for_null_selector: get guest instruction failed\n");
    35.9          domain_crash_synchronous();
   35.10      }
   35.11  
   35.12 @@ -1470,7 +1470,7 @@ static int vmx_assist(struct vcpu *v, in
   35.13      }
   35.14  
   35.15   error:
   35.16 -    printf("Failed to transfer to vmxassist\n");
   35.17 +    printk("Failed to transfer to vmxassist\n");
   35.18      domain_crash_synchronous();
   35.19      return 0;
   35.20  }
    36.1 --- a/xen/arch/x86/setup.c	Mon Oct 23 14:19:14 2006 +0100
    36.2 +++ b/xen/arch/x86/setup.c	Mon Oct 23 14:42:52 2006 +0100
    36.3 @@ -296,7 +296,7 @@ void __init __start_xen(multiboot_info_t
    36.4  
    36.5      init_console();
    36.6  
    36.7 -    printf("Command line: %s\n", cmdline);
    36.8 +    printk("Command line: %s\n", cmdline);
    36.9  
   36.10      /* Check that we have at least one Multiboot module. */
   36.11      if ( !(mbi->flags & MBI_MODULES) || (mbi->mods_count == 0) )
    37.1 --- a/xen/arch/x86/x86_32/entry.S	Mon Oct 23 14:19:14 2006 +0100
    37.2 +++ b/xen/arch/x86/x86_32/entry.S	Mon Oct 23 14:42:52 2006 +0100
    37.3 @@ -398,7 +398,7 @@ domain_crash_synchronous_string:
    37.4  
    37.5  domain_crash_synchronous:
    37.6          pushl $domain_crash_synchronous_string
    37.7 -        call  printf
    37.8 +        call  printk
    37.9          jmp   __domain_crash_synchronous
   37.10  
   37.11          ALIGN
    38.1 --- a/xen/arch/x86/x86_32/supervisor_mode_kernel.S	Mon Oct 23 14:19:14 2006 +0100
    38.2 +++ b/xen/arch/x86/x86_32/supervisor_mode_kernel.S	Mon Oct 23 14:42:52 2006 +0100
    38.3 @@ -141,5 +141,5 @@ domain_crash_synchronous_string:
    38.4  
    38.5  domain_crash_synchronous:
    38.6          pushl $domain_crash_synchronous_string
    38.7 -        call  printf
    38.8 +        call  printk
    38.9          jmp   __domain_crash_synchronous
    39.1 --- a/xen/arch/x86/x86_64/entry.S	Mon Oct 23 14:19:14 2006 +0100
    39.2 +++ b/xen/arch/x86/x86_64/entry.S	Mon Oct 23 14:42:52 2006 +0100
    39.3 @@ -328,7 +328,7 @@ domain_crash_synchronous:
    39.4          # printk(domain_crash_synchronous_string)
    39.5          leaq  domain_crash_synchronous_string(%rip),%rdi
    39.6          xorl  %eax,%eax
    39.7 -        call  printf
    39.8 +        call  printk
    39.9          jmp  __domain_crash_synchronous
   39.10  
   39.11          ALIGN
    40.1 --- a/xen/common/sched_sedf.c	Mon Oct 23 14:19:14 2006 +0100
    40.2 +++ b/xen/common/sched_sedf.c	Mon Oct 23 14:42:52 2006 +0100
    40.3 @@ -1190,10 +1190,10 @@ static void sedf_dump_domain(struct vcpu
    40.4      
    40.5  #ifdef SEDF_STATS
    40.6      if ( EDOM_INFO(d)->block_time_tot != 0 )
    40.7 -        printf(" pen=%"PRIu64"%%", (EDOM_INFO(d)->penalty_time_tot * 100) /
    40.8 +        printk(" pen=%"PRIu64"%%", (EDOM_INFO(d)->penalty_time_tot * 100) /
    40.9                 EDOM_INFO(d)->block_time_tot);
   40.10      if ( EDOM_INFO(d)->block_tot != 0 )
   40.11 -        printf("\n   blks=%u sh=%u (%u%%) (shc=%u (%u%%) shex=%i "\
   40.12 +        printk("\n   blks=%u sh=%u (%u%%) (shc=%u (%u%%) shex=%i "\
   40.13                 "shexsl=%i) l=%u (%u%%) avg: b=%"PRIu64" p=%"PRIu64"",
   40.14                 EDOM_INFO(d)->block_tot, EDOM_INFO(d)->short_block_tot,
   40.15                 (EDOM_INFO(d)->short_block_tot * 100) 
   40.16 @@ -1206,7 +1206,7 @@ static void sedf_dump_domain(struct vcpu
   40.17                 (EDOM_INFO(d)->block_time_tot) / EDOM_INFO(d)->block_tot,
   40.18                 (EDOM_INFO(d)->penalty_time_tot) / EDOM_INFO(d)->block_tot);
   40.19  #endif
   40.20 -    printf("\n");
   40.21 +    printk("\n");
   40.22  }
   40.23  
   40.24  
    41.1 --- a/xen/drivers/char/console.c	Mon Oct 23 14:19:14 2006 +0100
    41.2 +++ b/xen/drivers/char/console.c	Mon Oct 23 14:42:52 2006 +0100
    41.3 @@ -294,7 +294,7 @@ static inline void __putstr(const char *
    41.4      }
    41.5  }
    41.6  
    41.7 -void printf(const char *fmt, ...)
    41.8 +void printk(const char *fmt, ...)
    41.9  {
   41.10      static char   buf[1024];
   41.11      static int    start_of_line = 1;
    42.1 --- a/xen/include/asm-ia64/config.h	Mon Oct 23 14:19:14 2006 +0100
    42.2 +++ b/xen/include/asm-ia64/config.h	Mon Oct 23 14:42:52 2006 +0100
    42.3 @@ -232,7 +232,7 @@ typedef long clock_t;
    42.4  extern unsigned long loops_per_jiffy;
    42.5  extern char saved_command_line[];
    42.6  struct screen_info { };
    42.7 -#define seq_printf(a,b...) printf(b)
    42.8 +#define seq_printf(a,b...) printk(b)
    42.9  //#define CONFIG_BLK_DEV_INITRD // needed to reserve memory for domain0
   42.10  
   42.11  #define CONFIG_SHADOW	1
    43.1 --- a/xen/include/asm-ia64/vcpu.h	Mon Oct 23 14:19:14 2006 +0100
    43.2 +++ b/xen/include/asm-ia64/vcpu.h	Mon Oct 23 14:42:52 2006 +0100
    43.3 @@ -200,7 +200,7 @@ vcpu_get_next_timer_ns(VCPU *vcpu)
    43.4      return vcpu_get_next_timer_ns;
    43.5  }
    43.6  
    43.7 -#define verbose(a...) do {if (vcpu_verbose) printf(a);} while(0)
    43.8 +#define verbose(a...) do {if (vcpu_verbose) printk(a);} while(0)
    43.9  
   43.10  //#define vcpu_quick_region_check(_tr_regions,_ifa) 1
   43.11  #define vcpu_quick_region_check(_tr_regions,_ifa)           \
    44.1 --- a/xen/include/xen/lib.h	Mon Oct 23 14:19:14 2006 +0100
    44.2 +++ b/xen/include/xen/lib.h	Mon Oct 23 14:42:52 2006 +0100
    44.3 @@ -51,8 +51,7 @@ extern void debugtrace_printk(const char
    44.4  
    44.5  /* Allows us to use '%p' as general-purpose machine-word format char. */
    44.6  #define _p(_x) ((void *)(unsigned long)(_x))
    44.7 -#define printk(_f , _a...) printf( _f , ## _a )
    44.8 -extern void printf(const char *format, ...)
    44.9 +extern void printk(const char *format, ...)
   44.10      __attribute__ ((format (printf, 1, 2)));
   44.11  extern void panic(const char *format, ...)
   44.12      __attribute__ ((format (printf, 1, 2)));